[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 4 Sep 2012 07:51:05 +0000 (09:51 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 4 Sep 2012 07:51:05 +0000 (09:51 +0200)
bzr revid: tde@openerp.com-20120904075105-ljg3lgn6tf958kvd

1  2 
openerp/addons/base/res/res_partner.py
openerp/tools/misc.py

Simple merge