[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Thu, 16 Sep 2010 04:41:37 +0000 (10:11 +0530)
committerapa-tiny <apa@tinyerp.com>
Thu, 16 Sep 2010 04:41:37 +0000 (10:11 +0530)
bzr revid: apa@tinyerp.com-20100916044137-j2qv61qncc52t305


Trivial merge