Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 Jan 2013 17:01:49 +0000 (17:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 Jan 2013 17:01:49 +0000 (17:01 +0000)

Trivial merge