Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.99
diff -u -p -r1.99 form.inc
--- includes/form.inc	13 Apr 2006 19:50:13 -0000	1.99
+++ includes/form.inc	14 Apr 2006 06:23:10 -0000
@@ -976,6 +976,9 @@ function theme_textarea($element) {
  */
 
 function theme_markup($element) {
+  if (isset($element['#title']) || isset($element['#description'])) {
+    return theme('form_element', $element['#title'], $element['#value'], $element['#description']) . $element['#children'];
+  }
   return $element['#value'] . $element['#children'];
 }