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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit ca050ba3eec6b8c4c5bbd75e44bde089058995ee
Merge: 0c90770... 116d8d0...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jul 18 09:12:43 2011 +0100

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

 tests/ghc-regress/safeHaskell/check/CheckB.hs      |    2 +-
 tests/ghc-regress/safeHaskell/check/CheckB.stderr  |    2 +-
 .../check/{Check03_A.hs => CheckB_Aux.hs}          |    2 +-
 tests/ghc-regress/safeHaskell/check/all.T          |    4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)