Sun Dec 7 06:09:15 PST 2008 David Waern <david.waern at gmail.com>
* Solve conflict
M ./src/Haddock/GHC.hs -1
View patch online:
http://darcs.haskell.org/ghc-6.10/haddock2/_darcs/patches/20081207140915-a762e-bc938311fdf12341a4f7e6a18d26ba7873808c4e.gz