[MERGE]:merged abo's changes
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 3 Aug 2012 05:13:24 +0000 (10:43 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 3 Aug 2012 05:13:24 +0000 (10:43 +0530)
commit8ca300bc4ee44e7e698b4565d115ef5c8e22d0f0
tree5fe87ad66d21141500a0b3fb3a10d852e64f2b47
parent941fe87e7b72579c5d0d55b1e7062bcd643c1a83
parenta7730a5346e77cbc0dab5b752c6a2a377c61ea7c
[MERGE]:merged abo's changes

bzr revid: apa@tinyerp.com-20120803051324-qakzv0d3t2gbzhs2