Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 27 Apr 2012 15:28:31 +0000 (16:28 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 27 Apr 2012 15:28:31 +0000 (16:28 +0100)

Trivial merge