[MERGE]
authorjas <jas@tinyerp.com>
Thu, 21 Oct 2010 04:54:20 +0000 (10:24 +0530)
committerjas <jas@tinyerp.com>
Thu, 21 Oct 2010 04:54:20 +0000 (10:24 +0530)
bzr revid: jas@tinyerp.com-20101021045420-jvsilf3ljober3kp


Trivial merge