[MERGE]
authorAmit Patel <apa@tinyerp.com>
Tue, 23 Oct 2012 05:54:55 +0000 (11:24 +0530)
committerAmit Patel <apa@tinyerp.com>
Tue, 23 Oct 2012 05:54:55 +0000 (11:24 +0530)
bzr revid: apa@tinyerp.com-20121023055455-u8yhmaat3w34hmc8


Trivial merge