merged from trunk
authorapa-tiny <apa@tinyerp.com>
Mon, 15 Nov 2010 10:46:45 +0000 (16:16 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 15 Nov 2010 10:46:45 +0000 (16:16 +0530)
bzr revid: apa@tinyerp.com-20101115104645-vul9ovrm3zf53eh1


Trivial merge