Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 24 Oct 2012 18:57:55 +0000 (19:57 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 24 Oct 2012 18:57:55 +0000 (19:57 +0100)
1  2 
compiler/main/DynFlags.hs
compiler/prelude/PrelRules.lhs

Simple merge
Simple merge