Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Sep 2011 08:12:48 +0000 (09:12 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Sep 2011 08:12:48 +0000 (09:12 +0100)
commit4714d50a5f49b35f1644d1d89de1a732b2e9737b
tree36fd249abad432f5e239c9ac747598a684a65b62
parentbfb7d7368ec4edc2b8dade1eee05e168b14b1278
parent4c353372c32276f179b96d6964a5c33c3211d295
Merge branch 'master' of darcs.haskell.org/ghc