Merge commit 'a52ff761' into local-gc

aclocal.m4

compiler/cmm/CLabel.hs

compiler/cmm/PprC.hs

compiler/codeGen/CgHpc.hs

compiler/codeGen/CgProf.hs

compiler/codeGen/CodeGen.lhs

compiler/codeGen/StgCmm.hs

compiler/codeGen/StgCmmHpc.hs

compiler/codeGen/StgCmmProf.hs

compiler/deSugar/Coverage.lhs

compiler/deSugar/Desugar.lhs

compiler/ghc.cabal.in

compiler/ghc.mk

compiler/main/DriverPipeline.hs

compiler/main/GHC.hs

compiler/main/HscMain.lhs

compiler/main/HscTypes.lhs

compiler/main/TidyPgm.lhs

compiler/profiling/ProfInit.hs

configure.ac