[MERGE]
authorapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 05:04:45 +0000 (10:34 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 05:04:45 +0000 (10:34 +0530)
bzr revid: apa@tinyerp.com-20101124043000-7ldthiwx1eze1ss7
bzr revid: apa@tinyerp.com-20101124050445-3o2szdqh6ys7xens


Trivial merge