Merge branch 'master' of http://darcs.haskell.org/testsuite
authorDavid Terei <davidterei@gmail.com>
Mon, 5 Dec 2011 21:17:26 +0000 (13:17 -0800)
committerDavid Terei <davidterei@gmail.com>
Mon, 5 Dec 2011 21:17:26 +0000 (13:17 -0800)

Trivial merge