Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
	compiler/prelude/PrelNames.lhs

diff --cc compiler/deSugar/Check.lhs
Simple merge

diff --cc compiler/deSugar/DsArrows.lhs
Simple merge

diff --cc compiler/deSugar/DsMeta.hs
Simple merge

diff --cc compiler/hsSyn/HsPat.lhs
Simple merge

diff --cc compiler/hsSyn/HsUtils.lhs
Simple merge

diff --cc compiler/main/DynFlags.hs
Simple merge

diff --cc compiler/parser/Lexer.x
Simple merge

diff --cc compiler/parser/Parser.y.pp
Simple merge

diff --cc compiler/parser/RdrHsSyn.lhs
Simple merge

diff --cc compiler/prelude/PrelNames.lhs
index 3c85d04,e1d287a..d3f0602
--- 1/compiler/prelude/PrelNames.lhs
--- 2/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@@ -221,11 -222,12 +222,16 @@@ basicKnownKeyName
        -- dotnet interop
        , objectTyConName, marshalObjectName, unmarshalObjectName
        , marshalStringName, unmarshalStringName, checkDotnetResName
 -
 +      
 +      -- Generics
 +      , rep0ClassName, rep1ClassName
 +      , datatypeClassName, constructorClassName, selectorClassName
 +      
+         -- Monad comprehensions
+         , guardMName
+         , liftMName
+         , groupMName
+         , mzipName
      ]
  
  genericTyConNames :: [Name]

diff --cc compiler/rename/RnBinds.lhs
Simple merge

diff --cc compiler/typecheck/TcGenDeriv.lhs
Simple merge

diff --cc compiler/typecheck/TcPat.lhs
Simple merge

diff --cc compiler/typecheck/TcRnDriver.lhs
Simple merge

diff --cc compiler/typecheck/TcSMonad.lhs
Simple merge