Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Feb 2013 13:56:29 +0000 (13:56 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 12 Feb 2013 13:56:29 +0000 (13:56 +0000)

Trivial merge