[commit: ghc] master: Merge branch 'master' of win:c:/m64/reg13/. (2b214ea)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2b214ea1fc1134139fd10369062f3efcea4ff96b

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

commit 2b214ea1fc1134139fd10369062f3efcea4ff96b
Merge: 8690440... c287070...
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri May 18 17:55:30 2012 +0100

    Merge branch 'master' of win:c:/m64/reg13/.

 compiler/deSugar/DsForeign.lhs |   25 +++++++--
 rts/Adjustor.c                 |  112 ++++++++++++++++++++++++++--------------
 2 files changed, 92 insertions(+), 45 deletions(-)