commit 143023c8550f7e8858f294f033294aeb023faf75
Author: Ken VanDine <kvandine@gnome.org>
Date:   Tue Jun 30 13:04:27 2009 -0400

    Reorganized the preferences/administration menus following the categories defined in gnomecc.  bz #337428

diff --git a/layout/settings.menu b/layout/settings.menu
index 588d4cb..63f8932 100644
--- a/layout/settings.menu
+++ b/layout/settings.menu
@@ -20,21 +20,43 @@
 
   <!-- Merge in these other files as submenus -->
   <Menu>
-    <Name>Preferences</Name>
-    <Directory>Settings.directory</Directory>
+    <Name>Personal</Name>
+    <Directory>Personal.directory</Directory>
     <Include>
       <And>
-        <Category>Settings</Category>
-        <Not>
-          <Or>
-            <Category>System</Category>
-            <Filename>gnomecc.desktop</Filename>
-          </Or>
-        </Not>
+        <Category>X-GNOME-PersonalSettings</Category>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Directory>LookAndFeel.directory</Directory>
+    <Include>
+      <And>
+        <Category>DesktopSettings</Category>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Internet and Network</Name>
+    <Directory>Network.directory</Directory>
+    <Include>
+      <And>
+        <Category>X-GNOME-NetworkSettings</Category>
+      </And>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>Hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>HardwareSettings</Category>
       </And>
     </Include>
   </Menu>
 
+
   <!-- System Settings -->
   <Menu>
     <Name>Administration</Name>
@@ -48,8 +70,11 @@
   </Menu>     <!-- End System Settings -->
 
   <Layout>
-    <Menuname>Preferences</Menuname>
-    <Menuname>Administration</Menuname>
+    <Menuname>Personal</Menuname>
+    <Menuname>Look and Feel</Menuname>
+    <Menuname>Internet and Network</Menuname>
+    <Menuname>Hardware</Menuname>
+    <Menuname>System</Menuname>
     <Merge type="menus"/>
     <Merge type="files"/>
   </Layout>
