[MERGE] Sync with latest trunk
authorOlivier Dony <odo@openerp.com>
Fri, 18 May 2012 08:49:26 +0000 (10:49 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 18 May 2012 08:49:26 +0000 (10:49 +0200)
commit2f9888a7016df56ecfabd88341fa942073f55f9b
treeee74dde7c2e7ee4fe78caab3c6c2ad429127ee06
parent3a4ebf326618ae30ede150aba0e322ec018a7820
parent86ae049b8a0c58baddcb2ff217024286e9153345
[MERGE] Sync with latest trunk

bzr revid: odo@openerp.com-20120518084926-dplc49g38krv7dsn
openerp/addons/base/__openerp__.py
openerp/addons/base/ir/ir.xml