[MERGE]
authorapa-tiny <apa@tinyerp.com>
Wed, 13 Oct 2010 10:27:15 +0000 (15:57 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 13 Oct 2010 10:27:15 +0000 (15:57 +0530)
commita8686cfe64eb10344206529b1f8d34c2b6ee5dd2
treed9591681513dcca247899c4ccc23216a56af7091
parent1743200e489362a6c4776ac1ac9d7f239b1ddd63
parentb3191afaf72ce6abd5f70d1dd439caf82c5db13c
[MERGE]

bzr revid: apa@tinyerp.com-20101013102715-br2f48p5okzywt75