[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Wed, 12 Sep 2012 12:11:16 +0000 (17:41 +0530)
committerAmit Patel <apa@tinyerp.com>
Wed, 12 Sep 2012 12:11:16 +0000 (17:41 +0530)
bzr revid: apa@tinyerp.com-20120912121116-1hpl73spulp9670o


Trivial merge