[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:29:37 +0000 (10:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:29:37 +0000 (10:59 +0530)
bzr revid: apa@tinyerp.com-20120719052937-jrdl4ywlip5utqpo


Trivial merge