[MERGE]
authorapa-tiny <apa@tinyerp.com>
Mon, 27 Sep 2010 10:02:57 +0000 (15:32 +0530)
committerapa-tiny <apa@tinyerp.com>
Mon, 27 Sep 2010 10:02:57 +0000 (15:32 +0530)
bzr revid: apa@tinyerp.com-20100927100257-jtxowgiduoalo6ey


Trivial merge