Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 Apr 2012 13:17:54 +0000 (14:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 Apr 2012 13:17:54 +0000 (14:17 +0100)
1  2 
compiler/ghc.cabal.in

Simple merge