[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Thu, 9 Sep 2010 04:43:47 +0000 (10:13 +0530)
committerapa-tiny <apa@tinyerp.com>
Thu, 9 Sep 2010 04:43:47 +0000 (10:13 +0530)
bzr revid: apa@tinyerp.com-20100909044347-f8khtig0nkbm8z34


Trivial merge