Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Jul 2012 13:27:17 +0000 (14:27 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 13 Jul 2012 13:27:17 +0000 (14:27 +0100)

Trivial merge