Changes to ghc

Changes to ghc:
commit b1ee32edbe9be7b695cce7975450782e0a290c47
Author: Herbert Valerio Riedel <hvr@gnu.org>
Date:   Wed Feb 26 23:51:23 2014 +0100

    Follow-up to 32f41c79

    These parts were forgotten to be committed together with the rest of
    32f41c79960ffc1d04c4573acb37756109d279a5

    Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>