[commit: ghc] master: Merge win:/cygdrive/c/ghc/git/dt (0aae298)

[Ian Lynagh]

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

On branch  : master

https://github.com/ghc/ghc/commit/0aae29808d76ce45b88017102056f3391cec57a3

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

commit 0aae29808d76ce45b88017102056f3391cec57a3
Merge: a2be710 b35a6ce
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun May 12 20:31:45 2013 +0100

    Merge win:/cygdrive/c/ghc/git/dt

 driver/utils/dynwrapper.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++
 ghc.mk                    |  27 +++----
 rules/build-prog.mk       |  21 ++++-
 rules/distdir-way-opts.mk |  12 +++
 utils/ghc-cabal/Main.hs   |   1 +
 5 files changed, 239 insertions(+), 19 deletions(-)