[MERGE] merged the branch with split of deliveries/receptions (second attempt)
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 15 May 2012 11:32:30 +0000 (13:32 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 15 May 2012 11:32:30 +0000 (13:32 +0200)
bzr revid: qdp-launchpad@openerp.com-20120515113230-75y0zg9h5goouh83


Trivial merge