[MERGE] Merge trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 2 May 2012 08:16:37 +0000 (10:16 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 2 May 2012 08:16:37 +0000 (10:16 +0200)
bzr revid: fme@openerp.com-20120502081637-pb56e2xcxdy0pqd0


Trivial merge