[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 15 Jul 2011 10:11:51 +0000 (12:11 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 15 Jul 2011 10:11:51 +0000 (12:11 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20110715101151-fshuut4ujslbzxvn


Trivial merge