Changes to ghc

Changes to ghc:
commit 95f95ed6281adf9616d87b97470d68fb54c0b7f3
Author: Austin Seipp <austin@well-typed.com>
Date:   Mon Jun 23 01:31:15 2014 -0500

    Fix up b84748121e777d

    I forgot to amend this to my last commit.

    Signed-off-by: Austin Seipp <austin@well-typed.com>