[MERGE]:merge
authorapa-tiny <apa@tinyerp.com>
Wed, 13 Oct 2010 09:01:42 +0000 (14:31 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 13 Oct 2010 09:01:42 +0000 (14:31 +0530)
commita3d6b27eb4e99740187a4e03cf9f9cf03c1a57f9
treedcb22dd7dd7cbee19495442aa4aedda7b4a9fd49
parent57220f193d77606c88c5d16f7b025bc6135d284f
parent0c1559160c9026469eb0c2a27811943d803b1f27
[MERGE]:merge

bzr revid: apa@tinyerp.com-20101013090142-90ndmy2sujwle58k