[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Jul 2012 04:55:28 +0000 (10:25 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Jul 2012 04:55:28 +0000 (10:25 +0530)
bzr revid: apa@tinyerp.com-20120717045528-8g7wsjuybe0s3epy


Trivial merge