[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Wed, 2 Apr 2014 08:01:14 +0000 (10:01 +0200)
committerGery Debongnie <ged@openerp.com>
Wed, 2 Apr 2014 08:01:14 +0000 (10:01 +0200)
bzr revid: ged@openerp.com-20140402080114-dlody276p3xrmyvq


Trivial merge