merge
authorFabien Pinckaers <fp@openerp.com>
Tue, 14 Aug 2012 16:39:01 +0000 (18:39 +0200)
committerFabien Pinckaers <fp@openerp.com>
Tue, 14 Aug 2012 16:39:01 +0000 (18:39 +0200)
bzr revid: fp@openerp.com-20120814163901-chassx588kktn17y


Trivial merge