Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 23 Dec 2011 17:57:13 +0000 (17:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 23 Dec 2011 17:57:13 +0000 (17:57 +0000)
commit4716851af175ec9e63b92a616693b8e29be1d0ab
treef9ac3a47e47ea24b2ae738344d720ff8bfe619e8
parentcfcddaae2382ddb7f6d6d71fd15501709defd3d7
parent541781f280e007b511038046c85babc45e99959b
Merge branch 'master' of darcs.haskell.org/ghc