Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Mar 2012 14:19:00 +0000 (14:19 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Mar 2012 14:19:00 +0000 (14:19 +0000)
commit14dfd4cf6dd619a0aa143890fa527047c74aa01e
tree53ec341a10d46b44f1f58f4c4803da7aafc244bd
parent9b602e75aa46edbdb5120eafb106da0b3478e05b
parent4bbe9f719f4c26e7f2d8e5a3a8096ac956e1be6c
Merge branch 'master' of darcs.haskell.org/ghc