Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.378
diff -u -p -r1.378 menu.inc
--- includes/menu.inc	30 Jan 2010 03:38:22 -0000	1.378
+++ includes/menu.inc	1 Feb 2010 17:52:07 -0000
@@ -1576,28 +1576,6 @@ function menu_list_system_menus() {
 }
 
 /**
- * Return an array of links to be rendered as the Main menu.
- */
-function menu_main_menu() {
-  return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'));
-}
-
-/**
- * Return an array of links to be rendered as the Secondary links.
- */
-function menu_secondary_menu() {
-
-  // If the secondary menu source is set as the primary menu, we display the
-  // second level of the primary menu.
-  if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) {
-    return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1);
-  }
-  else {
-    return menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0);
-  }
-}
-
-/**
  * Return an array of links for a navigation menu.
  *
  * @param $menu_name
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.572
diff -u -p -r1.572 theme.inc
--- includes/theme.inc	30 Jan 2010 07:54:01 -0000	1.572
+++ includes/theme.inc	1 Feb 2010 17:52:10 -0000
@@ -2388,8 +2388,6 @@ function template_preprocess_page(&$vari
   $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
   $variables['logo']              = theme_get_setting('logo');
   $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
-  $variables['main_menu']         = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
-  $variables['secondary_menu']    = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
   $variables['action_links']      = menu_local_actions();
   $variables['site_name']         = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');
   $variables['site_slogan']       = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.73
diff -u -p -r1.73 menu.admin.inc
--- modules/menu/menu.admin.inc	31 Jan 2010 18:53:16 -0000	1.73
+++ modules/menu/menu.admin.inc	1 Feb 2010 17:52:11 -0000
@@ -656,26 +656,5 @@ function menu_configure() {
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
 
-  $main = variable_get('menu_main_links_source', 'main-menu');
-  $main_options = array_merge($menu_options, array('' => t('No Main links')));
-  $form['menu_main_links_source'] = array(
-    '#type' => 'select',
-    '#title' => t('Source for the Main links'),
-    '#default_value' => 'main-menu',
-    '#options' => $main_options,
-    '#tree' => FALSE,
-    '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
-  );
-
-  $secondary_options = array_merge($menu_options, array('' => t('No Secondary links')));
-  $form['menu_secondary_links_source'] = array(
-    '#type' => 'select',
-    '#title' => t('Source for the Secondary links'),
-    '#default_value' => 'user-menu',
-    '#options' => $secondary_options,
-    '#tree' => FALSE,
-    '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
-  );
-
   return system_settings_form($form, TRUE);
 }
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.43
diff -u -p -r1.43 page.tpl.php
--- modules/system/page.tpl.php	30 Jan 2010 07:59:25 -0000	1.43
+++ modules/system/page.tpl.php	1 Feb 2010 17:52:12 -0000
@@ -102,12 +102,6 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
-      <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
-      </div></div> <!-- /.section, /#navigation -->
-    <?php endif; ?>
-
     <?php if ($breadcrumb): ?>
       <div id="breadcrumb"><?php print $breadcrumb; ?></div>
     <?php endif; ?>
@@ -144,7 +138,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.256
diff -u -p -r1.256 system.admin.inc
--- modules/system/system.admin.inc	30 Jan 2010 07:54:01 -0000	1.256
+++ modules/system/system.admin.inc	1 Feb 2010 17:52:17 -0000
@@ -481,8 +481,6 @@ function system_theme_settings($form, &$
     'comment_user_picture'      => t('User pictures in comments'),
     'comment_user_verification' => t('User verification status in comments'),
     'favicon'                   => t('Shortcut icon'),
-    'main_menu'                 => t('Main menu'),
-    'secondary_menu'            => t('Secondary menu'),
   );
 
   // Some features are not always available
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.444
diff -u -p -r1.444 system.install
--- modules/system/system.install	30 Jan 2010 07:59:25 -0000	1.444
+++ modules/system/system.install	1 Feb 2010 17:52:21 -0000
@@ -2606,6 +2606,15 @@ function system_update_7050() {
 }
 
 /**
+ * Remove primary and secondary links variables.
+ */
+function system_update_7051() {
+  variable_del('menu_main_links_source');
+  variable_del('menu_secondary_links_source');
+  return array();
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
Index: profiles/standard/standard.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/standard/standard.install,v
retrieving revision 1.5
diff -u -p -r1.5 standard.install
--- profiles/standard/standard.install	15 Jan 2010 10:09:03 -0000	1.5
+++ profiles/standard/standard.install	1 Feb 2010 17:52:21 -0000
@@ -146,6 +146,36 @@ function standard_install() {
       'cache' => -1,
     ),
     array(
+      'module' => 'user',
+      'delta' => 'user-menu',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => 2,
+      'region' => 'sidebar_first',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
+      'delta' => 'main-menu',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'navigation',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
+      'delta' => 'secondary-menu',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => 0,
+      'region' => 'footer',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
       'module' => 'system',
       'delta' => 'powered-by',
       'theme' => 'garland',
Index: themes/garland/garland.info
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/garland.info,v
retrieving revision 1.9
diff -u -p -r1.9 garland.info
--- themes/garland/garland.info	1 Dec 2009 15:57:40 -0000	1.9
+++ themes/garland/garland.info	1 Feb 2010 17:52:22 -0000
@@ -8,3 +8,14 @@ engine = phptemplate
 stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 settings[garland_width] = fluid
+regions[header] = Header
+regions[navigation] = Navigation
+regions[highlight] = Highlighted content
+regions[help] = Help
+regions[content] = Content
+regions[sidebar_first] = Left sidebar
+regions[sidebar_second] = Right sidebar
+regions[footer] = Footer
+
+regions[page_top] = Page top
+regions[page_bottom] = Page bottom
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.42
diff -u -p -r1.42 page.tpl.php
--- themes/garland/page.tpl.php	30 Jan 2010 07:59:26 -0000	1.42
+++ themes/garland/page.tpl.php	1 Feb 2010 17:52:22 -0000
@@ -27,8 +27,7 @@
         <?php endif; ?>
         </div>
 
-        <?php if ($primary_nav): print $primary_nav; endif; ?>
-        <?php if ($secondary_nav): print $secondary_nav; endif; ?>
+        <?php print render($page['navigation']); ?>
       </div> <!-- /#header -->
 
       <?php if ($page['sidebar_first']): ?>
Index: themes/garland/print.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/print.css,v
retrieving revision 1.8
diff -u -p -r1.8 print.css
--- themes/garland/print.css	3 Aug 2009 03:04:34 -0000	1.8
+++ themes/garland/print.css	1 Feb 2010 17:52:22 -0000
@@ -7,7 +7,6 @@ body, input, textarea, select {
   font-size: 11pt;
 }
 
-ul.main-menu, ul.secondary-menu,
 #header-region, .sidebar {
   display: none;
 }
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.17
diff -u -p -r1.17 style-rtl.css
--- themes/garland/style-rtl.css	22 Nov 2009 03:25:42 -0000	1.17
+++ themes/garland/style-rtl.css	1 Feb 2010 17:52:22 -0000
@@ -144,31 +144,6 @@ body.sidebar-second #squeeze {
   z-index: 3;
 }
 
-/**
- * Primary navigation
- */
-ul.main-menu {
-  float: left;
-  width:70%;
-}
-
-ul.main-menu li {
-  float: right;
-}
-
-/**
- * Secondary navigation
- */
-ul.secondary-menu {
-  float: left;
-  clear: left;
-  margin-left: 16em;
-}
-
-ul.secondary-menu li {
-  float: right;
-}
-
 ul.primary {
   float: right;
 }
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.73
diff -u -p -r1.73 style.css
--- themes/garland/style.css	30 Jan 2010 07:59:26 -0000	1.73
+++ themes/garland/style.css	1 Feb 2010 17:52:24 -0000
@@ -389,6 +389,7 @@ body.fluid-width #wrapper #container {
 
 #wrapper #container #header {
   height: 80px;
+  position: relative;
 }
 
 #wrapper #container #header #logo-floater {
@@ -585,24 +586,35 @@ body.overlay {
 }
 
 /**
- * Primary navigation
+ * Navigation region menus
  */
-ul.main-menu {
+ .region-navigation .block{
+  float: right;
+}
+
+.region-navigation .block .content{
+  margin: 0;
+}
+.region-navigation h2{
+  display: none;
+}
+ 
+.region-navigation ul.menu{
   margin: 0;
   padding: 0;
   float: right; /* LTR */
-  position: relative;
   z-index: 4;
 }
 
-ul.main-menu li {
+.region-navigation ul.menu li{
   margin: 0;
   padding: 0;
   float: left; /* LTR */
-  background-image: none;
+  list-style-image: none;
+  list-style-type: none;
 }
 
-ul.main-menu li a, ul.main-menu li a:link, ul.main-menu li a:visited {
+.region-navigation ul.menu li a, .region-navigation ul.menu li a:link, .region-navigation ul.menu li a:visited{
   display: block;
   margin: 0 1em;
   padding: .75em 0 0;
@@ -610,31 +622,31 @@ ul.main-menu li a, ul.main-menu li a:lin
   background: transparent url(images/bg-navigation-item.png) no-repeat 50% 0;
 }
 
-ul.main-menu li a:hover, ul.main-menu li a.active {
+.region-navigation ul.menu li a:hover, .region-navigation ul.menu li a.active{
   color: #fff;
   background: transparent url(images/bg-navigation-item-hover.png) no-repeat 50% 0;
 }
 
 /**
- * Secondary navigation
+ * Navigation region menus second level
  */
-ul.secondary-menu {
+.region-navigation ul.menu ul.menu {
   margin: 0;
   padding: 18px 0 0;
-  float: right; /* LTR */
-  clear: right; /* LTR */
-  position: relative;
+  position: absolute;
   z-index: 4;
+  right: 0;
 }
 
-ul.secondary-menu li {
+.region-navigation ul.menu ul.menu li {
   margin: 0;
   padding: 0;
   float: left; /* LTR */
-  background-image: none;
+  list-style-image: none;
+  list-style-type: none;
 }
 
-ul.secondary-menu li a, ul.secondary-menu li a:link, ul.secondary-menu li a:visited {
+.region-navigation ul.menu ul.menu li a, .region-navigation ul.menu ul.menu li a:link, .region-navigation ul.menu ul.menu li a:visited {
   display: block;
   margin: 0 1em;
   padding: .75em 0 0;
@@ -642,12 +654,72 @@ ul.secondary-menu li a, ul.secondary-men
   background: transparent;
 }
 
-ul.secondary-menu li a:hover, ul.secondary-menu li a.active {
+.region-navigation ul.menu ul.menu li a:hover, .region-navigation ul.menu ul.menu li a.active {
   color: #cde3f1;
   background: transparent;
 }
 
 /**
+ * Footer region menus
+ */
+.region-footer h2{
+  display: none;
+}
+ 
+.region-footer ul.menu{
+  margin: 0;
+  padding: 0;
+  float: left; /* LTR */
+  position: relative;
+  margin-bottom: 3em;
+}
+
+.region-footer ul.menu li{
+  margin: 0;
+  padding: 0;
+  float: left; /* LTR */
+  list-style-image: none;
+  list-style-type: none;
+}
+
+.region-footer ul.menu li a, .region-footer ul.menu li a:link, .region-footer ul.menu li a:visited{
+  display: block;
+  margin: 0 1em;
+  padding: .75em 0 0;
+}
+
+/**
+ * Footer region menus second level
+ */
+.region-footer ul.menu ul.menu {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  left: 0;
+}
+
+.region-footer ul.menu ul.menu li {
+  margin: 0;
+  padding: 0;
+  float: left; /* LTR */
+  list-style-image: none;
+  list-style-type: none;
+}
+
+.region-footer ul.menu ul.menu li a, .region-footer ul.menu ul.menu li a:link, .region-footer ul.menu ul.menu li a:visited {
+  display: block;
+  margin: 0 1em;
+  padding: .75em 0 0;
+  color: #529ad6;
+  background: transparent;
+}
+
+.region-footer ul.menu ul.menu li a:hover, .region-footer ul.menu ul.menu li a.active {
+  color: #529ad6;
+  background: transparent;
+}
+
+/**
  * Local tasks
  */
 ul.primary, ul.primary li, ul.secondary, ul.secondary li {
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.37
diff -u -p -r1.37 template.php
--- themes/garland/template.php	30 Jan 2010 07:59:26 -0000	1.37
+++ themes/garland/template.php	1 Feb 2010 17:52:24 -0000
@@ -57,39 +57,6 @@ function garland_process_html(&$vars) {
  */
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-  if (isset($vars['main_menu'])) {
-    $vars['primary_nav'] = theme('links__system_main_menu', array(
-      'links' => $vars['main_menu'],
-      'attributes' => array(
-        'class' => array('links', 'main-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Main menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['primary_nav'] = FALSE;
-  }
-  if (isset($vars['secondary_menu'])) {
-    $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
-      'links' => $vars['secondary_menu'],
-      'attributes' => array(
-        'class' => array('links', 'secondary-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['secondary_nav'] = FALSE;
-  }
-
   // Prepare header.
   $site_fields = array();
   if (!empty($vars['site_name'])) {