[MERGE]: merge from same branch
authorMantavya Gajjar <mga@tinyerp.com>
Fri, 30 Jul 2010 11:13:15 +0000 (16:43 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Fri, 30 Jul 2010 11:13:15 +0000 (16:43 +0530)
commit74bb18e62229afa56bd9cad7bc8c6f5a6dc2cc70
tree17e6360e2916118ab5e89c8faa285c1d91ac43cf
parent99732f4c39c8e1778ad0184125b3090fcc1dc2d5
parent921bd3ce555c88a68b1e1255f6d9c3f90814c5fb
[MERGE]: merge from same branch

bzr revid: mga@tinyerp.com-20100730111315-4socq2ihd6n2m36x