Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 16:30:43 +0000 (16:30 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 16:30:43 +0000 (16:30 +0000)
commit3a3dcc31e401e48771d430f3bf02d5e019b6f997
tree3b2e779318d19edc3fcc308cf853ca7e0a89c20f
parenta686d1cb6dbaa28b629f6e7aa9a5a6b44d1f3ab1
parentc2121ec425c806ea423916af41d5f371e3acaf50
Merge branch 'master' of darcs.haskell.org/ghc