Merge nb:ghc/git/ghc/testsuite
authorIan Lynagh <igloo@earth.li>
Mon, 23 Apr 2012 15:12:19 +0000 (16:12 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 23 Apr 2012 15:12:19 +0000 (16:12 +0100)

Trivial merge