[MERGE] trunk
authoropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 09:50:17 +0000 (10:50 +0100)
committeropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 09:50:17 +0000 (10:50 +0100)
bzr revid: openerp-sle@openerp-sle.home-20140217095017-st100iyy9vkuzyhc


Trivial merge