Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jul 2012 15:40:51 +0000 (16:40 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jul 2012 15:40:51 +0000 (16:40 +0100)
commitdae6dfdbf7de621721ffffb8d6bfa24ca5fe8d1d
tree6a64488565f3320c2bf2181b050f1b3bde1fd682
parentb6013700b05f5daaeaa0ae00a56f3871adef687a
parenta211fcf6b55a3f6dbc0a58674aea581d9aa686e7
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc