[commit: testsuite] master: Merge branches 'master' and 'master' of darcs.haskell.org:/srv/darcs/testsuite (a842b7e)

[Ben Lippmeier]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a842b7ecac5a0c4e5cd9578ffe898d61c34e0ab6

>---------------------------------------------------------------

commit a842b7ecac5a0c4e5cd9578ffe898d61c34e0ab6
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Fri Dec 16 11:12:10 2011 +1100

    Merge branches 'master' and 'master' of darcs.haskell.org:/srv/darcs/testsuite