[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 18 Aug 2010 04:50:20 +0000 (10:20 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 18 Aug 2010 04:50:20 +0000 (10:20 +0530)
commit5045d01b757c3b5b37115ca2a0386f7702780d19
tree68b5ae8a7edaff7e65458174f2f3e74050377960
parentc2c1dcbee0e40354e82b1337091650c0276059d8
parentad32f01bae2d71732a50620ff7bb63e5a6aa6985
[MERGE]: Merge with lp:openobject-addons-trunk

bzr revid: ksa@tinyerp.co.in-20100818045020-5syvioz4guncqje6