[MERGE]
authorThibault Francois <tfr@openerp.com>
Tue, 11 Jan 2011 09:07:56 +0000 (10:07 +0100)
committerThibault Francois <tfr@openerp.com>
Tue, 11 Jan 2011 09:07:56 +0000 (10:07 +0100)
bzr revid: tfr@openerp.com-20110111090756-v2t5sll6nkptljw1


Trivial merge