Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 1 Mar 2013 17:52:54 +0000 (17:52 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 1 Mar 2013 17:52:54 +0000 (17:52 +0000)

Trivial merge