[MERGE] with trunk
authorThibault Francois <tfr@openerp.com>
Fri, 12 Nov 2010 13:03:19 +0000 (14:03 +0100)
committerThibault Francois <tfr@openerp.com>
Fri, 12 Nov 2010 13:03:19 +0000 (14:03 +0100)
bzr revid: tfr@openerp.com-20101112130319-79xb14cdvdixvglw


Trivial merge