Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 10:17:03 +0000 (11:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Oct 2012 10:17:03 +0000 (11:17 +0100)
commit65e6470c39e9d45cbdb7834486bcae7f4a6259e6
tree00e487458d72d55bc9de079dac0a3ec2b36777fd
parentba56d20d767f0425f6f7515fa9c78b186589b896
parent3b980d0e7e043ae2a8e6d668d78451a599f55842
Merge branch 'master' of darcs.haskell.org/ghc