[merge]
authorpso <pso@tinyerp.com>
Tue, 24 Nov 2009 12:08:48 +0000 (17:38 +0530)
committerpso <pso@tinyerp.com>
Tue, 24 Nov 2009 12:08:48 +0000 (17:38 +0530)
bzr revid: pso@tinyerp.com-20091124120848-xh42tl4ls4v2ne1t


Trivial merge