[commit: base] imp-param-class: Merge remote-tracking branch 'origin/master' into imp-param-class (c1177ef)

[Iavor Diatchki]

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

On branch  : imp-param-class

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

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

commit c1177ef4bbd936ba17b3d9a4cb3d3e2ee55a71b0
Merge: 4917efe... a0395aa...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Jun 10 14:50:51 2012 -0700

    Merge remote-tracking branch 'origin/master' into imp-param-class

 Control/Concurrent.hs      |   27 +++++++++++--
 Control/Concurrent/MVar.hs |   19 ++++++++-
 Data/Typeable.hs           |    1 -
 Data/Typeable/Internal.hs  |    1 +
 GHC/TypeLits.hs            |    2 +-
 System/IO.hs               |   88 +++++++++++++++++++++++++++++++------------
 cbits/Win32Utils.c         |    6 +++
 7 files changed, 110 insertions(+), 34 deletions(-)