[MERGE] Merge trunk
authorFabien Meghazi <fme@openerp.com>
Mon, 9 Jul 2012 08:54:05 +0000 (10:54 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 9 Jul 2012 08:54:05 +0000 (10:54 +0200)
bzr revid: fme@openerp.com-20120709085405-ba74sedzlmotol5o


Trivial merge