[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)
commit7fc65f714bca352ec1897fabe0cca10b6a02c225
tree94081b534b1712843f6c2579128d3bc6a90fdf3f
parentccd44774dbcf7d4c40617c1de41238aad9a37039
parent290e729bd8926d0cf10f3887183a638f6c945d4e
[MERGE]

bzr revid: rha@tinyerp.com-20110630112756-dtxlio616x5yf75b