[IMP]:merged from trunk
authorapa-tiny <apa@tinyerp.com>
Tue, 7 Sep 2010 04:37:45 +0000 (10:07 +0530)
committerapa-tiny <apa@tinyerp.com>
Tue, 7 Sep 2010 04:37:45 +0000 (10:07 +0530)
bzr revid: apa@tinyerp.com-20100907043745-lpomcuk5z7mikmed


Trivial merge