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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit c08295a1786d07ab5c0120d4a0a1608d0253039f
Merge: 08af551... 6046b25...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Feb 13 16:54:49 2013 +0000

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

 compiler/prelude/PrelNames.lhs       |    5 +++--
 compiler/typecheck/TcGenGenerics.lhs |    7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)