[MERGE]:account
authorAmit Patel <apa@tinyerp.com>
Wed, 21 Nov 2012 09:07:47 +0000 (14:37 +0530)
committerAmit Patel <apa@tinyerp.com>
Wed, 21 Nov 2012 09:07:47 +0000 (14:37 +0530)
bzr revid: apa@tinyerp.com-20121121090747-mv6te9mcleku9qp3


Trivial merge