[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (5469388)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5469388bdee59967f8262d5285ff9522d52ff191

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

commit 5469388bdee59967f8262d5285ff9522d52ff191
Merge: 2cc42db... fb93d79...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 22 17:01:49 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 compiler/llvmGen/LlvmCodeGen/Base.hs |    2 +-
 compiler/main/HscStats.lhs           |  187 ----------------------------------
 2 files changed, 1 insertions(+), 188 deletions(-)