[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:13:17 +0000 (10:43 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:13:17 +0000 (10:43 +0530)
bzr revid: fka@tinyerp.com-20120903051317-bq2zytg6xvp0o6mp


Trivial merge