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

[Iavor Diatchki]

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

On branch  : imp-param-class

http://hackage.haskell.org/trac/ghc/changeset/4917efe6b38381f8c4f36f977f98d7c0c4f00db5

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

commit 4917efe6b38381f8c4f36f977f98d7c0c4f00db5
Merge: f849706... 5fd5497...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Jun 10 13:41:26 2012 -0700

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

 Data/List.hs   |    3 ++-
 GHC/Exts.hs    |    2 +-
 tests/IO/all.T |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)