[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)
bzr revid: fka@tinyerp.com-20120903052244-zsq8wnjalpiogtjq


Trivial merge