Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Feb 2012 13:50:39 +0000 (13:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Feb 2012 13:50:39 +0000 (13:50 +0000)
commit1e00b774a237eb48101e67ff65429db3bd36e560
tree24b2b5e5bbc580e47368e4284e0c0d9bba217814
parent154af13a71a2711793a4d78a1b0782a9501f233c
parenta40125e45d3d503942c7a4101dc7b9d87203e591
Merge branch 'master' of darcs.haskell.org/ghc