[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 14 Jun 2011 15:33:27 +0000 (17:33 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 14 Jun 2011 15:33:27 +0000 (17:33 +0200)
commit1ef02c15864006fd4d5a5c40593f989961a3e617
treedcadda9313771fe4eaf8529d992a4c3acbbb79d0
parent4c1bfafa12b1d6fcb8277b57bdf2dad143321ed4
parent1015da6dd89eaace8ee0d2c21963b8e1b991745c
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20110614094406-zur3betzzamqdfl0
bzr revid: nicolas.vanhoren@openerp.com-20110614153327-9g363s8luw1td389