Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jan 2012 14:11:53 +0000 (14:11 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jan 2012 14:11:53 +0000 (14:11 +0000)
commitf0c760ce548a2f2889abfe6a1a726994a418e675
treebf36d4a9f5dd20e46506053f75c5378f9e382696
parent8c2aa498b7798f176a0a23f6b501806b8712d8a5
parent4a0eb925b4e5cfc917365521caee1d9041fb2d98
Merge branch 'master' of darcs.haskell.org/ghc