From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Fri, 20 May 2011 18:15:23 +0000 (+0200)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7fd719237b68a356f80269ff083c073acec6f8f0

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

Fixed conflicts:
	compiler/typecheck/TcSMonad.lhs
---

7fd719237b68a356f80269ff083c073acec6f8f0