[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 07:01:23 +0000 (12:31 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 07:01:23 +0000 (12:31 +0530)
bzr revid: apa@tinyerp.com-20120730070123-yvx1zhdvceymf7mi


Trivial merge