[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:42:59 +0000 (16:12 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:42:59 +0000 (16:12 +0530)
commit87658d9de80e3dd55f7b7e5ec7885fc20fc85474
treebc85dba24c706a9b31b6dc4b679bfa36be26e220
parent91c022497bb07f1c951fe6c2c1883c5b8bde0325
parent31064b1855a60bf211c4a6f0abcb304865ee692e
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831104259-3gqgnikdczkmcgv2