[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Thu, 13 Sep 2012 05:20:46 +0000 (10:50 +0530)
committerAmit Patel <apa@tinyerp.com>
Thu, 13 Sep 2012 05:20:46 +0000 (10:50 +0530)
bzr revid: apa@tinyerp.com-20120912124210-cn5y3gcbxhew53h1
bzr revid: apa@tinyerp.com-20120913052046-r2lxb209eau3xnvo


Trivial merge