Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:18:54 +0000 (16:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:18:54 +0000 (16:18 +0100)
1  2 
compiler/typecheck/TcDeriv.lhs

Simple merge