[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Wed, 15 Sep 2010 04:43:14 +0000 (10:13 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 15 Sep 2010 04:43:14 +0000 (10:13 +0530)
bzr revid: apa@tinyerp.com-20100915044314-mvn54zau20z97ug6


Trivial merge