Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 14:42:59 +0000 (14:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 14:42:59 +0000 (14:42 +0000)

Trivial merge