[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 25 Jul 2012 07:09:48 +0000 (12:39 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 25 Jul 2012 07:09:48 +0000 (12:39 +0530)
bzr revid: apa@tinyerp.com-20120725070948-ev2syztrahc3nwcz


Trivial merge