[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:20:57 +0000 (16:20 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:20:57 +0000 (16:20 +0200)
bzr revid: stw@openerp.com-20111005142057-qshud5cor3s7j8v7


Trivial merge