[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:59:31 +0000 (16:59 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:59:31 +0000 (16:59 +0200)
bzr revid: stw@openerp.com-20111005145931-piwiavbep6sr8nx3


Trivial merge