Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 1 Jan 2013 13:24:58 +0000 (13:24 +0000)
committerIan Lynagh <ian@well-typed.com>
Tue, 1 Jan 2013 13:24:58 +0000 (13:24 +0000)
1  2 
compiler/main/DynFlags.hs

Simple merge