Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Sun, 23 Dec 2012 15:51:55 +0000 (15:51 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sun, 23 Dec 2012 15:51:55 +0000 (15:51 +0000)

Trivial merge