[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)
bzr revid: fka@tinyerp.com-20120831104259-3gqgnikdczkmcgv2


Trivial merge