Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 node.admin.inc
--- modules/node/node.admin.inc	8 Dec 2007 14:06:21 -0000	1.14
+++ modules/node/node.admin.inc	16 Dec 2007 21:40:17 -0000
@@ -243,8 +243,7 @@ function theme_node_filter_form($form) {
   $output = '';
   $output .= '<div id="node-admin-filter">';
   $output .= drupal_render($form['filters']);
-  $output .= '</div>';
-  $output .= drupal_render($form);
+  $output .= '</div>'; 
   return $output;
 }
 
@@ -358,6 +357,11 @@ function node_admin_content($form_state)
   return $form;
 }
 
+function theme_node_admin_content($form) {
+	$output = theme('node_filter_form', $form) . theme('node_admin_nodes', $form['admin']);
+	return $output; 
+}
+
 function node_admin_nodes() {
 
   $filter = node_build_filter_query();
@@ -401,7 +405,6 @@ function node_admin_nodes() {
   }
   $form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
   $form['pager'] = array('#value' => theme('pager', NULL, 50, 0));
-  $form['#theme'] = 'node_admin_nodes';
   return $form;
 }
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.926
diff -u -p -r1.926 node.module
--- modules/node/node.module	14 Dec 2007 19:19:46 -0000	1.926
+++ modules/node/node.module	16 Dec 2007 21:40:18 -0000
@@ -88,6 +88,10 @@ function node_theme() {
       'arguments' => array('form' => NULL),
       'file' => 'node.admin.inc',
     ),
+    'node_admin_content' => array(
+      'arguments' => array('form' => NULL),
+      'file' => 'node.admin.inc',
+    ),
     'node_admin_nodes' => array(
       'arguments' => array('form' => NULL),
       'file' => 'node.admin.inc',
