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

[José Pedro Magalhães]

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

On branch  : new-typeable

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

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

commit 6b088b65aec02ee54318982a6d519de665d30dc8
Merge: 2f10d97... fa55000...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Wed Dec 12 11:15:06 2012 +0000

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

 Control/Arrow.hs            |    2 +-
 Control/Concurrent.hs       |    4 +
 Control/Concurrent/QSem.hs  |  133 +++++++++++++++++++++++++++++++++++++++++++
 Control/Concurrent/QSemN.hs |  127 +++++++++++++++++++++++++++++++++++++++++
 Control/Exception.hs        |    2 +
 Control/Exception/Base.hs   |    3 +-
 GHC/Base.lhs                |    6 +-
 GHC/Conc/Sync.lhs           |   23 +++-----
 GHC/IO/Exception.hs         |   30 +++++++++-
 GHC/IO/Handle/Internals.hs  |    2 +-
 System/Timeout.hs           |   10 +++-
 base.cabal                  |    2 +
 tests/all.T                 |    3 +
 tests/qsem001.hs            |   88 ++++++++++++++++++++++++++++
 tests/qsemn001.hs           |  110 +++++++++++++++++++++++++++++++++++
 15 files changed, 521 insertions(+), 24 deletions(-)