[MERGE]merge with latest trunk-wms
authorCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:43:42 +0000 (17:43 +0100)
committerCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:43:42 +0000 (17:43 +0100)
bzr revid: csn@openerp.com-20140210164342-3x81l53zy1n43mwy


Trivial merge