[MERGE]:merged with parent branch
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 06:11:35 +0000 (11:41 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 06:11:35 +0000 (11:41 +0530)
commite071a67c91a03fa8c2fa7a5d9ee6d07c2b09b9b7
treeed6be6c976877f3a57509603541c52e6ea59a3b8
parent095c2d439118f9f5b2709fb0bb58ced3e19aef3e
parent537126dbad9e4a1615b166d248772802d1171189
[MERGE]:merged with parent branch

bzr revid: fka@tinyerp.com-20120719045834-pvptqr9g2qrgfyk4
bzr revid: apa@tinyerp.com-20120719061135-defy7b0x8f6r0k6g