[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:22:44 +0000 (10:52 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:22:44 +0000 (10:52 +0530)
commit97b7b8e55088b390a732d908d87d139bfec25bac
tree40d9934c1a9f50f893f52449952680e6d1d6c8a3
parente44d125479d9208d3d2d9b0b64b655b530a07eae
parent7e4225b3af25af84b5ad25b1db1320be69702435
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120903052244-zsq8wnjalpiogtjq