[Merge]
authorThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 16:47:06 +0000 (17:47 +0100)
committerThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 16:47:06 +0000 (17:47 +0100)
bzr revid: tfr@openerp.com-20110120164706-i9degss13cmbryiz


Trivial merge