[commit: base] master: Merge remote branch 'origin/master' into ghc-generics (54fb2ef)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/54fb2efb814fc5f65d3699e7a495b9c050729d58

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

commit 54fb2efb814fc5f65d3699e7a495b9c050729d58
Merge: 0d363cf... 8073392...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 26 14:33:23 2011 +0100

    Merge remote branch 'origin/master' into ghc-generics

 Control/Arrow.hs           |    2 +-
 Control/Concurrent/MVar.hs |    7 ++++
 Data/Complex.hs            |    2 +-
 Data/IORef.hs              |   44 +++++++++++++++++++++++++++
 GHC/Arr.lhs                |   14 ++++----
 GHC/Conc/Sync.lhs          |   14 +++++++--
 GHC/Environment.hs         |    2 +-
 GHC/IO/Encoding.hs         |   13 +++++++-
 GHC/IO/Handle.hs           |    2 +-
 GHC/Real.lhs               |    2 +-
 System/IO.hs               |    1 +
 tests/Makefile             |    7 ++++
 tests/all.T                |    6 ++++
 tests/enumDouble.hs        |    3 ++
 tests/enumDouble.stdout    |    1 +
 tests/enumRatio.hs         |    3 ++
 tests/enumRatio.stdout     |    1 +
 tests/fixed.hs             |   19 +++++++++++
 tests/fixed.stdout         |   72 ++++++++++++++++++++++++++++++++++++++++++++
 tests/readFloat.hs         |    5 +++
 tests/readFloat.stderr     |    1 +
 tests/tempfiles.hs         |   36 ++++++++++++++++++++++
 tests/tempfiles.stdout     |   12 +++++++
 23 files changed, 253 insertions(+), 16 deletions(-)