[IMP] base_setup,base: Display 'General Settings' as a secondary menuitem

addons/base_setup/res_config_view.xml

@@ -123,8 +123,8 @@
             <field name="view_mode">form</field>
             <field name="target">inline</field>
         </record>
-        <menuitem id="menu_general_configuration" parent="base.menu_config"
-            sequence="100" action="action_general_configuration"/>
+        <menuitem id="base.menu_config" name="General Settings" parent="base.menu_administration" sequence="1" action="action_general_configuration"/>
+
 
         <!-- Sale config wizard -->
         <record id="view_sale_config_settings" model="ir.ui.view">

openerp/addons/base/base_menu.xml

@@ -13,7 +13,6 @@
           sequence="500"
           groups="base.group_system"/>
           <menuitem id="menu_management" name="Apps" sequence="310" web_icon="base,static/description/modules.png" groups="base.group_system"/>
-          <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
           <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
           <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="0"/>
           <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>