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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/163da7f51b76efffbb816c538d81e2afe5f01519

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

commit 163da7f51b76efffbb816c538d81e2afe5f01519
Merge: f1fa6eb... 6ff3c31...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jan 28 13:51:55 2013 +0000

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

 distrib/compare/FilenameDescr.hs |   17 ++++++---
 distrib/compare/Utils.hs         |    2 +-
 distrib/compare/compare.hs       |   65 +++++++++++++++++++++++++++++++++----
 rts/sm/Scav.c                    |    2 +-
 sync-all                         |    2 +-
 5 files changed, 72 insertions(+), 16 deletions(-)