Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:26:03 +0000 (13:26 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:26:03 +0000 (13:26 +0200)
Resolved conflicts:
compiler/typecheck/TcTyClsDecls.lhs


No differences found