[commit: testsuite] master: Merge branch 'master' of http://darcs.haskell.org/testsuite (ba1c4ad)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit ba1c4adfa6e2cdf6f5b2a924e97a5ad3c67d3f69
Merge: b5fd784... dd31f20...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 17 12:14:04 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org/testsuite

 mk/test.mk                                  |    8 +-------
 tests/parser/should_fail/readFail001.stderr |    4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)