[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoratp (Open ERP) <atp@tinyerp.co.in>
Thu, 18 Nov 2010 11:49:29 +0000 (17:19 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Thu, 18 Nov 2010 11:49:29 +0000 (17:19 +0530)
commit9cb993a6ecd591a9bda15d1cab298b33d726864c
treec19145ed9e61adef2c3c509b5403e6261407e95f
parentf33fb9e7bbe1a8960c3e8bbfdfe1de86e3821010
parent3ea8781fff306460c32d89f56d6ea199a74320e0
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: atp@tinyerp.co.in-20101118050848-nzneb3ippw9ga455
bzr revid: atp@tinyerp.co.in-20101118114929-d8yjmla77aletsjy