Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 Nov 2011 22:01:48 +0000 (22:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 Nov 2011 22:01:48 +0000 (22:01 +0000)
commit2d5a1a5b14d636c3b248821da6a444fd02f74b8e
treec428228c59892218e4f22c791c0d9c7949651452
parent80f57ea48ab7c4f6fb5f50c0f929bacda53638be
parent6791fff4cf8821f547db95d73f10c1f7e37a65f6
Merge branch 'master' of darcs.haskell.org/ghc