[MERGE]: merging from the same branch
authorMantavya Gajjar <mga@tinyerp.com>
Wed, 23 Jun 2010 11:27:41 +0000 (16:57 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Wed, 23 Jun 2010 11:27:41 +0000 (16:57 +0530)
commitc77db99335ba6e68ee0f9535e0f441df9a576294
tree0013eba03a53b8c33a067936adc1f8d30439b3c3
parent0ecbc92cc638ea1f618c2101ceeef58082dc712f
parent412628535af20c7c645f2f6476e53c9953f548eb
[MERGE]: merging from the same branch

bzr revid: mga@tinyerp.com-20100623112741-yydv9wpz75k2x8u7