Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 14 Feb 2013 08:33:14 +0000 (08:33 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 14 Feb 2013 08:33:14 +0000 (08:33 +0000)

Trivial merge