[commit: haddock] master: Merge branch 'development' (64c6e24)

[David Waern]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/64c6e2464fb3a9207e01b01a17c815284e49808b

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

commit 64c6e2464fb3a9207e01b01a17c815284e49808b
Merge: ebb0717... 38ce6d5...
Author: David Waern <david.waern at gmail.com>
Date:   Fri Sep 30 23:48:24 2011 +0200

    Merge branch 'development'

 ANNOUNCE        |   35 +++++++++++++++++------------------
 CHANGES         |   12 ++++++++++++
 doc/haddock.xml |    2 +-
 haddock.cabal   |    5 ++++-
 haddock.spec    |    2 +-
 5 files changed, 35 insertions(+), 21 deletions(-)