Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 17:21:00 +0000 (17:21 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 17:21:00 +0000 (17:21 +0000)
commit50fd5a991f8a941f7357f48c98463d0ed1991fab
treeb5bdd7211bb54698d4d6d78ba6a8ff7040a250e6
parent4ada19d8ed90b03c3ced30be8fff3950a884748a
parent3a3dcc31e401e48771d430f3bf02d5e019b6f997
Merge branch 'master' of darcs.haskell.org/ghc