Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 12:59:53 +0000 (12:59 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 12:59:53 +0000 (12:59 +0000)

Trivial merge