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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/36bc4549e7439f00cb020aab327bc4ee5e15ed7e

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

commit 36bc4549e7439f00cb020aab327bc4ee5e15ed7e
Merge: 4e4078e... b7c8017...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Aug 13 22:52:52 2012 +0100

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

 GHC/Base.lhs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)