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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2c9452963971b72ce6c58baa2b20bd8461024cd3

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

commit 2c9452963971b72ce6c58baa2b20bd8461024cd3
Merge: b6c9c35... 71f44c4...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Oct 15 21:52:59 2012 +0100

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

 Debug/Trace.hs |   85 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 72 insertions(+), 13 deletions(-)