Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:16:55 +0000 (16:16 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:16:55 +0000 (16:16 +0000)

Trivial merge