[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 05:08:37 +0000 (10:38 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 05:08:37 +0000 (10:38 +0530)
bzr revid: apa@tinyerp.com-20120427050837-1rdfpnkt1q7pstaj


Trivial merge