[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)
bzr revid: apa@tinyerp.com-20120803051324-qakzv0d3t2gbzhs2


No differences found