Merge remote-tracking branch 'origin/master' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 28 Sep 2012 14:53:45 +0000 (15:53 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 28 Sep 2012 14:53:45 +0000 (15:53 +0100)
1  2 
compiler/main/DynFlags.hs
compiler/typecheck/TcRnMonad.lhs

Simple merge
Simple merge