[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (cc3d982)

[Ian Lynagh]

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

On branch  : master

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

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

commit cc3d9828f16541f5b8e266e46e28106272899bfe
Merge: 1d094f9... 93c03f8...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Jul 29 23:17:30 2012 +0100

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

 includes/ghc.mk               |    2 +-
 includes/mkDerivedConstants.c |   25 +++++++++++++++++++++++++
 rts/parallel/Pack.c           |    4 ++--
 3 files changed, 28 insertions(+), 3 deletions(-)