[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Mon, 2 Apr 2012 08:50:33 +0000 (10:50 +0200)
committerAntony Lesuisse <al@openerp.com>
Mon, 2 Apr 2012 08:50:33 +0000 (10:50 +0200)
commit6c8eb2004d56af576051a94c93ef7c3d4a8338c9
treed476250d0429846456f128277521d62a7dfa7b6c
parentfc9097988152c0af181f39ca8dfaa3f9b6f27330
parenta996e8500fcff678b37f6d1d5000ef8382d3d0b7
[MERGE] trunk

bzr revid: al@openerp.com-20120402085033-gq5abrmykw58gfns
addons/delivery/delivery_view.xml
addons/sale/sale_view.xml