[MERGE] merged with main addons branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 28 Mar 2012 14:19:42 +0000 (16:19 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 28 Mar 2012 14:19:42 +0000 (16:19 +0200)
bzr revid: qdp-launchpad@openerp.com-20120328141942-pee0uyvtop9atrj2


Trivial merge