[MERGE] trunk
authorSimon Lejeune <sle@openerp.com>
Wed, 16 Apr 2014 14:05:03 +0000 (16:05 +0200)
committerSimon Lejeune <sle@openerp.com>
Wed, 16 Apr 2014 14:05:03 +0000 (16:05 +0200)
bzr revid: sle@openerp.com-20140416140503-cq7atc8f1mwq3ond


Trivial merge