[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 9 May 2012 15:43:02 +0000 (17:43 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 9 May 2012 15:43:02 +0000 (17:43 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120509154302-3udmbpji1ietrpxv


Trivial merge