[MERGE]:merged with parent
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 07:23:13 +0000 (12:53 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 07:23:13 +0000 (12:53 +0530)
bzr revid: apa@tinyerp.com-20120720072313-1zgl21skbr4ezf1s


Trivial merge