Changes to ghc

Changes to ghc:
commit fdf370eb68bd2aa333845e8a7f19c4dd792d12d0
Author: Joachim Breitner <mail@joachim-breitner.de>
Date:   Tue Jun 10 17:18:19 2014 +0200

    Forgot to amend before pushing...