[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (81f4cd3)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/81f4cd3e08996d35b3a70dfee4d70a829f2f2622

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

commit 81f4cd3e08996d35b3a70dfee4d70a829f2f2622
Merge: 057384f... 109a1e5...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 17 13:57:37 2013 +0000

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

 aclocal.m4                  |   28 ++++++++----
 compiler/ghc.mk             |   99 ++++++++++++++++++++----------------------
 configure.ac                |   35 ++++-----------
 ghc.mk                      |   10 ++--
 ghc/ghc.mk                  |    2 +-
 libraries/primitive         |    1 -
 libraries/vector            |    1 -
 mk/config.mk.in             |   27 +++++++-----
 rules/build-package-data.mk |    7 +++-
 settings.in                 |    1 +
 utils/ghc-pkg/ghc.mk        |    4 +-
 11 files changed, 107 insertions(+), 108 deletions(-)