[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)
bzr revid: mga@tinyerp.com-20100623112741-yydv9wpz75k2x8u7


Trivial merge