[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Thu, 3 Apr 2014 14:46:51 +0000 (16:46 +0200)
committerGery Debongnie <ged@openerp.com>
Thu, 3 Apr 2014 14:46:51 +0000 (16:46 +0200)
bzr revid: ged@openerp.com-20140403144651-9c2a4wi5klvtnw75


Trivial merge