[MERGE] merge with trunk
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 04:58:43 +0000 (10:28 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 04:58:43 +0000 (10:28 +0530)
bzr revid: kbh@tinyerp.com-20120926045843-bqqhoajejxxefvk2


Trivial merge