Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Jan 2013 13:19:31 +0000 (13:19 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Jan 2013 13:19:31 +0000 (13:19 +0000)

Trivial merge