Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 18 Jan 2013 14:31:59 +0000 (14:31 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 18 Jan 2013 14:31:59 +0000 (14:31 +0000)

Trivial merge