[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)
commit85c0dce74e70559b97e1c53babf39474d3683d99
treeb3840a4c9f5614096b274d95ec36bd79f5ffd754
parent9be4b6771cc185806e34766f58f48b17cceb4b15
parentfec6fae661ffa3b94ccd7f84e0c7a14bb44dd0a0
[MERGE]

bzr revid: rha@tinyerp.com-20110504124349-o35a7dyqukxai57t