[MERGE] typo

bzr revid: fp@openerp.com-20121024195939-2rvx2yrl7g1wkcx5

diff --cc addons/mail/mail_thread_view.xml
index 5ef5e14,b741169..55cc1de
--- 1/addons/mail/mail_thread_view.xml
--- 2/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@@ -45,7 -45,7 +45,7 @@@
            sequence="10"/>
  
          <!-- Left-side menu: Feeds -->
-         <menuitem id="mail.mail_feeds" name="Feeds &amp; Mailbox" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
 -        <menuitem id="mail.mail_feeds" name="Feed &amp; Mailbox" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
++        <menuitem id="mail.mail_feeds" name="Messages" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
          <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
  
          <record id="mail_inboxfeeds" model="ir.ui.menu">