[merge]
authornvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 8 Nov 2010 10:22:22 +0000 (11:22 +0100)
committernvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 8 Nov 2010 10:22:22 +0000 (11:22 +0100)
commit91c0e7621c3e34d7f4a9d13faaf8d4a00e175fd9
tree8775d6e11e06b862c63690b1ee7e2bc34feae64d
parentb2f7d0c4455c1ad119899933addc26ea55c2fa34
parent03ea39746de124ce2c0ad30578f55f11cba856ec
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20101108102206-n49aylxp2sf6krp1
bzr revid: nicolas.vanhoren@openerp.com-20101108102222-hh2yawl34ofqwnke