merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 25 Jul 2012 13:39:17 +0000 (15:39 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 25 Jul 2012 13:39:17 +0000 (15:39 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120725133917-9azjb6n59xqiz56l


Trivial merge