[commit: ghc] master: Merge win:/cygdrive/c/m64/reg14 (d814d50)

[Ian Lynagh]

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

On branch  : master

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

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

commit d814d50585f2a2406c56d8199612e219ee2d6eb7
Merge: 596fc11... 20c50ee...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jun 7 15:26:53 2012 +0100

    Merge win:/cygdrive/c/m64/reg14

 rts/Capability.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)