[MERGE]
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Thu, 30 Jun 2011 11:27:56 +0000 (16:57 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Thu, 30 Jun 2011 11:27:56 +0000 (16:57 +0530)
bzr revid: rha@tinyerp.com-20110630112756-dtxlio616x5yf75b


Trivial merge