[commit: haddock] master, ghc-7.4: Merge ../ghc/utils/haddock (15c65be)

[David Waern]

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

On branches: master,ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/15c65be1ef48f1b8adb3f0c8b66075b2b1a698f3

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

commit 15c65be1ef48f1b8adb3f0c8b66075b2b1a698f3
Merge: 2e184f1... 12e619d...
Author: David Waern <david.waern at gmail.com>
Date:   Tue Dec 27 13:57:32 2011 +0100

    Merge ../ghc/utils/haddock

 haddock.cabal                |   18 ++++++++++++------
 src/Haddock/InterfaceFile.hs |    4 ++++
 2 files changed, 16 insertions(+), 6 deletions(-)