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

[dimitris at microsoft.com]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6804d94c8c2e80b4057f701782c03b1aac529980

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

commit 6804d94c8c2e80b4057f701782c03b1aac529980
Merge: 508d58b... dc1d249...
Author: Dimitrios Vytiniotis <dimitris at microsoft.com>
Date:   Thu May 19 09:57:29 2011 +0100

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

 tests/ghc-regress/lib/IO/encoding001.hs     |    6 +++---
 tests/ghc-regress/lib/IO/encoding002.stdout |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)