[MERGE]
authorapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:41:16 +0000 (10:11 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:41:16 +0000 (10:11 +0530)
bzr revid: apa@tinyerp.com-20101124044116-9347i618xj00yumy


Trivial merge