[MERGE]merge with trunk server
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Mon, 24 Sep 2012 10:28:48 +0000 (15:58 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Mon, 24 Sep 2012 10:28:48 +0000 (15:58 +0530)
bzr revid: kbh@tinyerp.com-20120924102848-f1720n704j78jvkn


Trivial merge