[MERGE]merge with server
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 05:01:20 +0000 (10:31 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 05:01:20 +0000 (10:31 +0530)
commit9d5209f42f364c16fc65fcbe408d6d5ddebb6070
tree238800bd3be35b05a9e68d4cac6c2172f3ea4a9a
parent0a276c99b5a182868f25e38a1dcce2255711d0ca
parent3cc8c24ef41027d52f2293f98877c2e1834d3468
[MERGE]merge with server

bzr revid: kbh@tinyerp.com-20120926050120-n6xcbugt5ib51345