Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 30 Jan 2013 14:31:19 +0000 (14:31 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 30 Jan 2013 14:31:19 +0000 (14:31 +0000)

Trivial merge