[MERGE]
authorThibault Francois <tfr@openerp.com>
Fri, 12 Nov 2010 13:08:21 +0000 (14:08 +0100)
committerThibault Francois <tfr@openerp.com>
Fri, 12 Nov 2010 13:08:21 +0000 (14:08 +0100)
bzr revid: tfr@openerp.com-20101112130821-3z0qw27nb71t81xo


Trivial merge