Changes to ghc

Changes to ghc:
commit 47b6e15c5e25eaa0b6984daf60bf3f4d3e48545e
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Thu Oct 24 12:37:44 2013 +0100

    Untabify (sorry didn't fully do it first time)