[commit: base] data-proxy: Merge branch 'master' into data-proxy (48f5e61)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : data-proxy

http://hackage.haskell.org/trac/ghc/changeset/48f5e6156cd65d725789a916541fc15a42b6954f

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

commit 48f5e6156cd65d725789a916541fc15a42b6954f
Merge: 71d53b5 a65ce19
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Jul 24 12:35:18 2013 +0100

    Merge branch 'master' into data-proxy

 GHC/Event/Thread.hs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)