merge from trunk
authorMinh Tran <mit@openerp.com>
Fri, 31 Aug 2012 13:11:18 +0000 (15:11 +0200)
committerMinh Tran <mit@openerp.com>
Fri, 31 Aug 2012 13:11:18 +0000 (15:11 +0200)
commit8239412dd5dcdc02a42163eaae410a52d8038522
tree98861b3e8cb9c87623e7aeb49e3646e3579ad92f
parent2687a6b1e9614a45e1c593215c7d107519dbab56
parenta99e5cae0a791cc870870435c6edd78b76301744
merge from trunk

bzr revid: mit@openerp.com-20120831131118-6i2vljv4pdqb7iqo
openerp/addons/base/module/module_view.xml
openerp/addons/base/res/res_partner_view.xml
setup.py