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

[Ian Lynagh]

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

On branch  : master

https://github.com/ghc/ghc/commit/2cf5bd3dd74d2236ddcd8be51529074c4853cb8f

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

commit 2cf5bd3dd74d2236ddcd8be51529074c4853cb8f
Merge: f6f1252 c797499
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 28 00:49:30 2013 +0100

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

 mk/config.mk.in     | 4 ++++
 rts/package.conf.in | 3 +++
 2 files changed, 7 insertions(+)