Index: includes/update.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/update.inc,v
retrieving revision 1.15
diff -u -p -r1.15 update.inc
--- includes/update.inc	24 Oct 2009 01:46:13 -0000	1.15
+++ includes/update.inc	24 Oct 2009 02:18:11 -0000
@@ -132,6 +132,15 @@ function update_fix_d7_requirements() {
     db_add_field('url_alias', 'source', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
     db_add_field('url_alias', 'alias', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
 
+    // Add new columns to {menu_router}.
+    db_add_field('menu_router', 'delivery_callback', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
+    db_add_field('menu_router', 'context', array(
+      'description' => 'Only for local tasks (tabs) - the context of a local task to control its placement.',
+      'type' => 'int',
+      'not null' => TRUE,
+      'default' => 0,
+    ));
+
     // Add the role_permisson table.
     $schema['role_permission'] = array(
       'fields' => array(
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.412
diff -u -p -r1.412 system.install
--- modules/system/system.install	24 Oct 2009 01:46:13 -0000	1.412
+++ modules/system/system.install	24 Oct 2009 02:18:12 -0000
@@ -2803,7 +2803,7 @@ function system_update_7040() {
  * function to be used for final page rendering and sending to browser.
  */
 function system_update_7041() {
-  db_add_field('menu_router', 'delivery_callback', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''));
+  // Moved to update_fix_d7_requirements().
 }
 
 /**
@@ -2836,12 +2836,7 @@ function system_update_7042() {
  * Add a 'context' field to {menu_router} to control contextual placement of local tasks.
  */
 function system_update_7043() {
-  db_add_field('menu_router', 'context', array(
-    'description' => 'Only for local tasks (tabs) - the context of a local task to control its placement.',
-    'type' => 'int',
-    'not null' => TRUE,
-    'default' => 0,
-  ));
+  // Moved to update_fix_d7_requirements().
 }
 
 /**