Merge branch 'master' of http://darcs.haskell.org/testsuite
authorAmos Robinson <amos.robinson@gmail.com>
Mon, 4 Mar 2013 02:54:11 +0000 (13:54 +1100)
committerAmos Robinson <amos.robinson@gmail.com>
Mon, 4 Mar 2013 02:54:11 +0000 (13:54 +1100)

Trivial merge