Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 25 Sep 2014 21:42:30 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 25 Sep 2014 21:42:30 +0000 (23:42 +0200)

Trivial merge