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

Trivial merge