Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jan 2012 12:14:04 +0000 (12:14 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 17 Jan 2012 12:14:04 +0000 (12:14 +0000)

Trivial merge