[commit: base] new-typeable: Merge branch 'master', remote-tracking branch 'origin' into new-typeable (6cddf87)

[José Pedro Magalhães]

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

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/6cddf8790d5182e125012419ee7b26e678c9dc7e

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

commit 6cddf8790d5182e125012419ee7b26e678c9dc7e
Merge: 6b088b6... e747d14...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jan 15 10:25:01 2013 +0000

    Merge branch 'master', remote-tracking branch 'origin' into new-typeable

 Control/Concurrent.hs     |   52 +++++++++++++++++++++++++++++++++++-
 Data/Fixed.hs             |   39 ++++++++++-----------------
 Data/List.hs              |    7 ++++-
 GHC/Conc.lhs              |    2 +
 GHC/Conc/IO.hs            |   40 ++++++++++++++++++++++++++++
 GHC/Event/IntMap.hs       |   63 ++++++++++++--------------------------------
 GHC/Float.lhs             |    9 ++++++
 GHC/IO/Buffer.hs          |    6 ++--
 GHC/IO/BufferedIO.hs      |    2 +-
 GHC/Read.lhs              |   30 ++++++++++++---------
 GHC/TypeLits.hs           |   56 +++++++++++++++++++++++++++++++++++++---
 Text/Read/Lex.hs          |   27 +++++++++++++++++--
 tests/all.T               |    1 +
 tests/qsem001.stdout      |    5 +++
 tests/qsemn001.hs         |   47 ++++++++++++++++-----------------
 tests/qsemn001.stdout     |    5 +++
 tests/readFixed001.hs     |   13 +++++++++
 tests/readFixed001.stdout |    6 ++++
 18 files changed, 289 insertions(+), 121 deletions(-)