[MERGE]
authorpso <pso@tinyerp.com>
Wed, 3 Nov 2010 12:59:59 +0000 (18:29 +0530)
committerpso <pso@tinyerp.com>
Wed, 3 Nov 2010 12:59:59 +0000 (18:29 +0530)
bzr revid: pso@tinyerp.com-20101103125959-scelvehgbrlhn2z8


Trivial merge