[commit: ghc] cross-compiler-alienless: Merge branch 'master' of https://github.com/ghc/ghc into cross-compiler-alienless (c7ec369)

[Gabor Greif]

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

On branch  : cross-compiler-alienless

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

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

commit c7ec369af4ce00476090f02c3f374a081eb5a71b
Merge: 6741921... b660cc0...
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu Aug 30 15:06:24 2012 +0200

    Merge branch 'master' of https://github.com/ghc/ghc into cross-compiler-alienless

 ghc/ghc.mk           |    4 ++--
 utils/ghc-pkg/ghc.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)