Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 12:42:21 +0000 (12:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 12:42:21 +0000 (12:42 +0000)

Trivial merge