[MERGE] sync with 7.0
authorMartin Trigaux <mat@openerp.com>
Tue, 22 Oct 2013 09:13:19 +0000 (11:13 +0200)
committerMartin Trigaux <mat@openerp.com>
Tue, 22 Oct 2013 09:13:19 +0000 (11:13 +0200)
bzr revid: mat@openerp.com-20131022091319-dzpe0i8936alq22y


Trivial merge