[MERGE]TRUNK.
authorVidhin Mehta <vme@tinyerp.com>
Fri, 1 Feb 2013 10:57:54 +0000 (16:27 +0530)
committerVidhin Mehta <vme@tinyerp.com>
Fri, 1 Feb 2013 10:57:54 +0000 (16:27 +0530)
bzr revid: vme@tinyerp.com-20130201105754-ct8g325j3m40gxee


Trivial merge