Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 Jan 2012 14:07:03 +0000 (14:07 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 Jan 2012 14:07:03 +0000 (14:07 +0000)
commit8c2aa498b7798f176a0a23f6b501806b8712d8a5
tree4b50b6c5411fd849871336465676ddecb804922d
parenta0f8b3acec4af74be47808b30365aac85721e84c
parent9e452874df05f5f98243576ffaefc2f356358038
Merge branch 'master' of darcs.haskell.org/ghc