Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.366
diff -u -r1.366 menu.inc
--- includes/menu.inc	6 Dec 2009 01:00:27 -0000	1.366
+++ includes/menu.inc	7 Dec 2009 20:43:12 -0000
@@ -921,7 +921,7 @@
     $element['#attributes']['class'] = $class;
     $element['#title'] = $data['link']['title'];
     $element['#href'] = $data['link']['href'];
-    $element['#localized_options'] = !empty($data['localized_options']) ? $data['localized_options'] : array();
+    $element['#localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : array();
     $element['#below'] = $data['below'] ? menu_tree_output($data['below']) : $data['below'];
     $element['#original_link'] = $data['link'];
     // Index using the link's unique mlid.
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.24
diff -u -r1.24 menu.test
--- modules/simpletest/tests/menu.test	1 Dec 2009 15:57:40 -0000	1.24
+++ modules/simpletest/tests/menu.test	7 Dec 2009 20:43:12 -0000
@@ -240,6 +240,31 @@
     $this->assertEqual(menu_test_static_variable(), 'delete', t('hook_menu_link_delete() fired correctly'));
   }
 
+  /**
+   * Test menu link 'options' storage and rendering.
+   */
+  function testMenuLinkOptions() {
+    // Create a menu link with options.
+    $menu_link = array(
+      'link_title' => 'Menu link options test',
+      'link_path' => 'node',
+      'module' => 'menu_test',
+      'options' => array(
+        'attributes' => array(
+          'title' => 'Test title attribute',
+        ),
+        'query' => array(
+          'testparam' => 'testvalue',
+        ),
+      ),
+    );
+    menu_link_save($menu_link);
+
+    // Load front page.
+    $this->drupalGet('node');
+    $this->assertRaw('title="Test title attribute"', t('Title attribute of a menu link renders.'));
+    $this->assertRaw('node?testparam=testvalue', t('Query parameter added to menu link.'));
+  }
 }
 
 /**