[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20110930122511-ddjsuqmwn0mr1p5q

diff --cc openerp/addons/base/base_data.xml
Simple merge

diff --cc openerp/addons/base/res/res_partner.py
index afd7d48,4ef582c..1c136b6
--- 1/openerp/addons/base/res/res_partner.py
--- 2/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@@ -152,7 -153,7 +155,8 @@@ notifications, such as the availabilit
          'address': [{'type': 'default'}],
          'category_id': _default_category,
          'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
 +        'opt_out' : False,
+         'color': 0,
      }
  
      def copy(self, cr, uid, id, default={}, context={}):

diff --cc openerp/addons/base/res/res_partner_view.xml
Simple merge