[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:29:25 +0000 (15:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:29:25 +0000 (15:59 +0530)
bzr revid: apa@tinyerp.com-20120628102925-17wg14ro1ie16gvx


Trivial merge