Forward port of 7.0 up to rev 4a064b9
authorMartin Trigaux <mat@openerp.com>
Wed, 24 Sep 2014 08:35:28 +0000 (10:35 +0200)
committerMartin Trigaux <mat@openerp.com>
Wed, 24 Sep 2014 08:35:28 +0000 (10:35 +0200)

Trivial merge