merged from trunk
authorapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:47:51 +0000 (10:17 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 3 Nov 2010 04:47:51 +0000 (10:17 +0530)
bzr revid: apa@tinyerp.com-20101103044751-fnrhlog907q3jnyb


Trivial merge