Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Nov 2012 12:52:12 +0000 (12:52 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Nov 2012 12:52:12 +0000 (12:52 +0000)

Trivial merge