[MERGE]
authorStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:22:14 +0000 (14:22 +0200)
committerStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:22:14 +0000 (14:22 +0200)
bzr revid: stw@openerp.com-20111003122214-mvattq2d8y1i66aw


Trivial merge