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

Trivial merge