Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.111
diff -u -p -r1.111 form.inc
--- includes/form.inc	26 Apr 2006 18:21:07 -0000	1.111
+++ includes/form.inc	28 Apr 2006 12:10:04 -0000
@@ -526,7 +526,7 @@ function form_render(&$elements) {
   }
 
   /* Call the form element renderer */
-  if (!isset($elements['#printed'])) {
+  if (!isset($elements['#printed']) && (!$elements['#theme_used'] || element_children($elements))) {
     $content = theme(($elements['#type']) ? $elements['#type']: 'markup', $elements);
     $elements['#printed'] = TRUE;
   }