[MERGE]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 9 Jun 2010 04:59:33 +0000 (10:29 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 9 Jun 2010 04:59:33 +0000 (10:29 +0530)
commit6032c4c1cce62aec8244f037f42253f5250edd88
treee4f55e06e6fb3351093df687283b1183ea760f39
parent6310fc2ad9ed8bbb80a5e689b7b3e1633fe81300
parentce424c9d8a1ba3bdd67420d56676d61ba7036174
[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100609045933-bzp8hd8sbp3aczk2