[MERGE]
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Tue, 10 May 2011 05:14:05 +0000 (10:44 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Tue, 10 May 2011 05:14:05 +0000 (10:44 +0530)
bzr revid: rha@tinyerp.com-20110510051405-zdzlbsf82wy6k3h2


Trivial merge