[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100429045756-9hkmlrl8cnme2672

diff --cc addons/base_setup/base_setup_installer.xml
index 594133d,3b1a98f..108004d
--- 1/addons/base_setup/base_setup_installer.xml
--- 2/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@@ -28,10 -28,9 +28,9 @@@ If you don't think you need any of thes
              <field name="account"/> <field name="purchase"/>
              <field name="hr"/> <field name="point_of_sale"/>
              <field name="marketing"/> <field name="misc_tools"/>
 -            <field name="report_designer"/>
 +            <field name="report_designer"/> <field name="thunderbird"/>
              <separator string="Vertical Modules" colspan="4"/>
              <field name="profile_association"/>
-             <field name="profile_training"/>
              <field name="profile_auction"/>
              <field name="profile_bookstore"/>
            </group>

diff --cc addons/base_setup/installer.py
Simple merge

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

diff --cc addons/crm/crm.py
Simple merge