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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/52c01c96ee45a589e320623ff082da9a2f378054

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

commit 52c01c96ee45a589e320623ff082da9a2f378054
Merge: 15ec883... 68b59ce...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Feb 10 15:34:07 2012 +0000

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

 compiler/rename/RnNames.lhs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)