From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Wed, 4 May 2011 19:43:41 +0000 (+0200)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6;p=ghc-hetmet.git

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

Fixed conflicts:
	compiler/prelude/PrelNames.lhs
---

ffabe3acb2d30be0c8e89e139f5bca7a1eb900f6
diff --cc compiler/prelude/PrelNames.lhs
index 3c85d04,e1d287a..d3f0602
--- a/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]