[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 20:43:10 +0000 (21:43 +0100)
committerJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 20:43:10 +0000 (21:43 +0100)
bzr revid: jco@openerp.com-20140312204310-goe4kfirt4o8q0o8


Trivial merge