Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 10:32:09 +0000 (10:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 10:32:09 +0000 (10:32 +0000)
1  2 
compiler/hsSyn/Convert.lhs
compiler/main/DynFlags.hs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcTyClsDecls.lhs

Simple merge
Simple merge
Simple merge
Simple merge