merged from trunk
authorapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:45:51 +0000 (10:15 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:45:51 +0000 (10:15 +0530)
bzr revid: apa@tinyerp.com-20101103044551-da5hm4qcgn2z4mxd


Trivial merge