[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (8a50e63)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8a50e632eeb02a9e0fe8c3e0c9a52129135fc7c1

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

commit 8a50e632eeb02a9e0fe8c3e0c9a52129135fc7c1
Merge: 7ae0f5b... a5879a6...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Feb 19 17:58:01 2013 +0000

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

 compiler/ghc.mk |    6 +++---
 rts/sm/Evac.c   |   17 +++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)