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)
commitb8bfab8076f1d8fd5ed1d634fee82fd4d2fc0ed8
treee736c4fd8a77773e081e3987d4c17bb2a9e7c98e
parentc548f91feddf149ee4d3358483828f2d4c0ec41b
parent713cf473de8a2ad7d0b8195d78860c25fec41839
Merge branch 'master' of darcs.haskell.org/ghc
compiler/typecheck/TcDeriv.lhs