[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 30 Aug 2012 13:29:00 +0000 (15:29 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 30 Aug 2012 13:29:00 +0000 (15:29 +0200)
commitaefe773e9630f33a6597477778aa0c0ef586d2d8
tree2505c4b49dc0d8686c2cb7bb5518a9f25a5220eb
parent7d8e6e7e8f80536f03b29a3e6423b08c8440e3f5
parenta99e5cae0a791cc870870435c6edd78b76301744
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120830132900-esb64kgm4zng5nta
openerp/addons/base/base_data.xml