Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Jan 2013 08:57:26 +0000 (08:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Jan 2013 08:57:26 +0000 (08:57 +0000)
1  2 
compiler/typecheck/TcTyClsDecls.lhs

Simple merge