Forward port of branch 7.0 up to rev 8abd003
authorMartin Trigaux <mat@odoo.com>
Mon, 27 Oct 2014 11:03:01 +0000 (12:03 +0100)
committerMartin Trigaux <mat@odoo.com>
Mon, 27 Oct 2014 11:03:01 +0000 (12:03 +0100)

Trivial merge