Merge branch '6.x-0.4-dev' of git.drupal.org:sandbox/spficklin/1337878 into 6.x-0.4-dev

base/tripal_core/tripal_core_views_data_export_download_form.tpl.php

@@ -0,0 +1,2 @@
+<?php print drupal_render($form); ?>
+