[MERGE]merge with latest trunk-wms
authorCedric Snauwaert <csn@openerp.com>
Thu, 30 Jan 2014 13:49:08 +0000 (14:49 +0100)
committerCedric Snauwaert <csn@openerp.com>
Thu, 30 Jan 2014 13:49:08 +0000 (14:49 +0100)
bzr revid: csn@openerp.com-20140130134908-uk2x255ync9y7koa


Trivial merge