Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Jan 2013 13:57:37 +0000 (13:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Jan 2013 13:57:37 +0000 (13:57 +0000)
commit81f4cd3e08996d35b3a70dfee4d70a829f2f2622
tree6a35e5a687dc8ea912b844046827c36ef924986d
parent057384f93b3d2c31d0d0e3041923ca6a6aa7a03d
parent109a1e53287f50103e8a5b592275940b6e3dbb53
Merge branch 'master' of darcs.haskell.org/ghc