Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 26 Oct 2012 10:06:29 +0000 (11:06 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 26 Oct 2012 10:06:29 +0000 (11:06 +0100)
1  2 
compiler/main/DynFlags.hs
mk/validate-settings.mk

Simple merge
Simple merge