[commit: base] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base (6b2c2ac)

[Ian Lynagh]

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

On branch  : master

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

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

commit 6b2c2acbe747cb4c7695b3a9fed362bb5a693b52
Merge: 5443ba9... 79d9ea6...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Aug 10 22:28:42 2012 +0100

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base

 Prelude.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)