Merge branch 'master' into ghc-new-co
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 10:32:05 +0000 (11:32 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 10:32:05 +0000 (11:32 +0100)
commit39bb1bd24f56d1abd9961813d9cd94b61c9d4c78
treea2cfa3235972494d06b54350091f58872151c3db
parentfdf8656855d26105ff36bdd24d41827b05037b91
parent44fbccd667455a26551e72a9a5c5fe114f35d932
Merge branch 'master' into ghc-new-co
compiler/main/DynFlags.hs