[MERGE] with lp:openobject-addons
authorThibault Francois <tfr@openerp.com>
Tue, 4 Jan 2011 10:02:35 +0000 (11:02 +0100)
committerThibault Francois <tfr@openerp.com>
Tue, 4 Jan 2011 10:02:35 +0000 (11:02 +0100)
bzr revid: tfr@openerp.com-20110104100235-iovwlof7x7u9arlh


Trivial merge