[MERGE] trunk
authoropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 14:20:30 +0000 (15:20 +0100)
committeropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 14:20:30 +0000 (15:20 +0100)
bzr revid: openerp-sle@openerp-sle.home-20140217142030-619etd09tv45gq3q


Trivial merge