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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3a3dcc31e401e48771d430f3bf02d5e019b6f997

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

commit 3a3dcc31e401e48771d430f3bf02d5e019b6f997
Merge: a686d1c... c2121ec...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 12 16:30:43 2012 +0000

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

 rts/package.conf.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)