merged w trunk
authorAntoine Huvelle <ahu@openerp.com>
Tue, 22 Nov 2011 12:06:13 +0000 (13:06 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Tue, 22 Nov 2011 12:06:13 +0000 (13:06 +0100)
bzr revid: ahu@openerp.com-20111122120613-1w5srrpvgxifdobm


Trivial merge