[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:32:43 +0000 (16:02 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:32:43 +0000 (16:02 +0530)
bzr revid: fka@tinyerp.com-20120831103243-cyk1ujall4akan8s


Trivial merge