[MERGE] latest trunk

bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc

diff --cc addons/portal/portal_data.xml
index d14bd82,5245c99..58f2fc3
--- 1/addons/portal/portal_data.xml
--- 2/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@@ -20,18 -20,6 +20,18 @@@
              <field name="view_mode">form</field>
          </record>
  
 +        <!-- Mail group for the company's jobs -->
 +        <record id="company_jobs" model="mail.group">
-             <field name="name">Company's jobs feed</field>
++            <field name="name">Company's jobs</field>
 +        </record>
 +
 +        <record id="action_jobs" model="ir.actions.act_window">
 +            <field name="name">Jobs</field>
 +            <field name="res_model">mail.group</field>
 +            <field name="res_id" ref="company_jobs"/>
 +            <field name="view_mode">form</field>
 +        </record>
 +
          <!-- Top menu item -->
          <menuitem name="Portal"
              id="portal_menu"