[MERGE] latest trunk

bzr revid: abo@openerp.com-20120720115612-j7iwkjxb98k2lu40

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/mail/mail_thread_view.xml
index ba2797a,f07e1e4..6872783
--- 1/addons/mail/mail_thread_view.xml
--- 2/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@@ -2,15 -2,14 +2,15 @@@
  <openerp>
      <data>
  
-         <!-- toplevel menu -->
-         <!-- TODO Rename to name of the default company -->
-         <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
-             web_icon="static/src/img/feeds.png"
-             web_icon_hover="static/src/img/feeds-hover.png"/>
+         <!-- Top menu item -->
+         <menuitem name="Feeds"
+           id="mail_feeds_main"
+           groups="base.group_user"
+           sequence="10"/>
  
          <!-- left-side menu: Feeds !-->
 -        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
 +        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
 +
          <record id="mail_wallfeeds" model="ir.ui.menu">
            <field name="name">News Feed</field>
            <field name="sequence" eval="10"/>

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/__openerp__.py
Simple merge