[MERGE]: Merge with lp:openobject-addons-trunk
authorksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 10 Aug 2010 12:55:54 +0000 (18:25 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 10 Aug 2010 12:55:54 +0000 (18:25 +0530)
commit98b3fdcc515a5950b4c6004a81235fa7b4ffc5ff
treeec275a57d212da2d05ac9cede3c8192cf9025608
parent5c97992c96ead0935729579f27a840c78692408a
parent5eacb4d1be7c0d3c58ba009845e1ad06c910b002
[MERGE]: Merge with lp:openobject-addons-trunk

bzr revid: ksa@tinyerp.co.in-20100810125554-rrrtssfyv9n96fbn