Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 5 Dec 2011 06:27:54 +0000 (06:27 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 5 Dec 2011 06:27:54 +0000 (06:27 +0000)

Trivial merge