[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 25 Jul 2012 11:26:48 +0000 (16:56 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 25 Jul 2012 11:26:48 +0000 (16:56 +0530)
bzr revid: apa@tinyerp.com-20120725112648-920akzwzi7z4leoj


Trivial merge