[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Thu, 1 Nov 2012 06:09:47 +0000 (11:39 +0530)
committerAmit Patel <apa@tinyerp.com>
Thu, 1 Nov 2012 06:09:47 +0000 (11:39 +0530)
bzr revid: apa@tinyerp.com-20121101060947-3a7trzeiiuij9nt1


Trivial merge