Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 12:34:14 +0000 (12:34 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 12:34:14 +0000 (12:34 +0000)

Trivial merge