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

Trivial merge