[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Mon, 13 Sep 2010 04:45:36 +0000 (10:15 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 13 Sep 2010 04:45:36 +0000 (10:15 +0530)
bzr revid: apa@tinyerp.com-20100913044536-764w7oer6277bkll


Trivial merge