Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 09:09:28 +0000 (09:09 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 09:09:28 +0000 (09:09 +0000)
1  2 
compiler/main/DynFlags.hs

Simple merge