[MERGE]
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Wed, 4 May 2011 12:43:49 +0000 (18:13 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Wed, 4 May 2011 12:43:49 +0000 (18:13 +0530)
bzr revid: rha@tinyerp.com-20110504124349-o35a7dyqukxai57t


Trivial merge