[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)
commitb89f923c8f125bec1adf9758b3465077d07eb02e
treed2153b8f7c66226ddb935b457573e1a24dd77400
parent3f694e2e6d537ebec5891466279ec5fd47455ea7
parent0f32b7aa0b76c0e47a40ebad57943a2c6d511dfa
[MERGE]

bzr revid: rha@tinyerp.com-20110510051405-zdzlbsf82wy6k3h2