[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)
bzr revid: kbh@tinyerp.com-20120926050120-n6xcbugt5ib51345


Trivial merge