[commit: base] master: Merge branch 'master' into rule_fixes (3de115f)

[Daniel Fischer]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3de115fb7f929d02792a4b8139c3aeb9e41e0422

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

commit 3de115fb7f929d02792a4b8139c3aeb9e41e0422
Merge: 80f7de6... dd30d2d...
Author: Daniel Fischer <daniel.is.fischer at googlemail.com>
Date:   Wed Feb 27 14:53:29 2013 +0100

    Merge branch 'master' into rule_fixes

 Control/Exception.hs      |    6 ------
 Control/Exception/Base.hs |   17 -----------------
 Data/String.hs            |    2 +-
 Data/Version.hs           |    9 ---------
 GHC/IO.hs                 |   14 +-------------
 GHC/IO/Encoding/Iconv.hs  |    2 +-
 System/Console/GetOpt.hs  |   13 +++++++++++++
 System/IO/Error.hs        |    8 --------
 8 files changed, 16 insertions(+), 55 deletions(-)