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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e7729b4d8310ed40b987f123eb7d0d91a527a781

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

commit e7729b4d8310ed40b987f123eb7d0d91a527a781
Merge: 47235c3... 96e3ae1...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 21 01:31:50 2013 +0000

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

 aclocal.m4       |   13 ++++++++++---
 ghc.mk           |    5 ++---
 libraries/binary |    2 +-
 rts/Schedule.c   |   35 +++++++++++++++++++++++------------
 4 files changed, 36 insertions(+), 19 deletions(-)