Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 11:30:43 +0000 (12:30 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 11:30:43 +0000 (12:30 +0100)
1  2 
compiler/deSugar/Desugar.lhs
compiler/main/DynFlags.hs
mk/validate-settings.mk

Simple merge
Simple merge
Simple merge