Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 15 Apr 2013 14:44:15 +0000 (15:44 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 15 Apr 2013 14:44:15 +0000 (15:44 +0100)

Trivial merge