Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 21 Oct 2011 22:11:36 +0000 (23:11 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 21 Oct 2011 22:11:36 +0000 (23:11 +0100)

Trivial merge