Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.367
diff -u -r1.367 form.inc
--- includes/form.inc	27 Aug 2009 04:40:12 -0000	1.367
+++ includes/form.inc	27 Aug 2009 10:30:06 -0000
@@ -1625,7 +1625,6 @@
  */
 function theme_fieldset($element) {
   if (!empty($element['#collapsible'])) {
-    $element['#attached_js']['misc/collapse.js'] = array();
 
     if (!isset($element['#attributes']['class'])) {
       $element['#attributes']['class'] = array();
@@ -2247,6 +2246,9 @@
 
   // Contains form element summary functionalities.
   $element['#attached_js']['misc/form.js'] = array('weight' => JS_LIBRARY + 1);
+  if (!empty($element['#collapsible'])) {
+    $element['#attached_js']['misc/collapse.js'] = array();
+  }
 
   return $element;
 }