[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)
commit0ead3f7df3837bc52f129e25c0c9f5a1043d5968
tree154d7db481ee645a1b9919034a925e8aafec72a5
parent626d4983c8b56fa0a85cd7ff352afe4e2726c8d4
parentf11a5f19ff3be87b137ac3c1e2742f9a799355c5
[MERGE]

bzr revid: apa@tinyerp.com-20100927100257-jtxowgiduoalo6ey