[MERGE]: merging from the same branch
authorMantavya Gajjar <mga@tinyerp.com>
Mon, 28 Jun 2010 11:51:13 +0000 (17:21 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Mon, 28 Jun 2010 11:51:13 +0000 (17:21 +0530)
commit69ea761e14462aedb9965bf407cac6dc1e6d0469
treef21e921c2d6aa964932b2506a97baf8b812ca2f1
parentaca407a77fa4c3b4fc024f9f585013b0b8ab565b
parent13917f92e07cad7be177ec62ba85151a4aaf8a44
[MERGE]: merging from the same branch

bzr revid: mga@tinyerp.com-20100628115113-6mcy4gxjunu42mis