Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 16 Jan 2012 13:13:38 +0000 (13:13 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 16 Jan 2012 13:13:38 +0000 (13:13 +0000)

Trivial merge