Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 09:49:54 +0000 (09:49 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 09:49:54 +0000 (09:49 +0000)
1  2 
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcSMonad.lhs

Simple merge
Simple merge