[merge] refactoring of 'openerp' to 'instance'
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 17 Apr 2012 12:16:27 +0000 (14:16 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 17 Apr 2012 12:16:27 +0000 (14:16 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120417121627-c2264x40jgikdpd8


Trivial merge