Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Apr 2013 17:20:23 +0000 (18:20 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Apr 2013 17:20:23 +0000 (18:20 +0100)

Trivial merge