[merge]
authornvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 8 Nov 2010 10:22:22 +0000 (11:22 +0100)
committernvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 8 Nov 2010 10:22:22 +0000 (11:22 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20101108102206-n49aylxp2sf6krp1
bzr revid: nicolas.vanhoren@openerp.com-20101108102222-hh2yawl34ofqwnke


Trivial merge