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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit abb78aabe90231153d74a3030e8a8a3f5ec477e2
Merge: 3fc1acd... 6046b25...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Feb 13 15:46:01 2013 +0000

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

 README                               |  104 ----------------------------------
 README.md                            |  100 ++++++++++++++++++++++++++++++++
 aclocal.m4                           |    2 +-
 compiler/prelude/PrelNames.lhs       |    5 +-
 compiler/typecheck/TcGenGenerics.lhs |    7 ++-
 5 files changed, 109 insertions(+), 109 deletions(-)