[commit: haddock] imp-param-class: Merge remote-tracking branch 'origin/master' into imp-param-class (8fc9e7b)

[Iavor Diatchki]

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

On branch  : imp-param-class

http://hackage.haskell.org/trac/ghc/changeset/8fc9e7b2049b2836cb38c2704ef06db3675eb392

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

commit 8fc9e7b2049b2836cb38c2704ef06db3675eb392
Merge: d48c2f0... 4fbd2b4...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun May 27 18:45:51 2012 -0700

    Merge remote-tracking branch 'origin/master' into imp-param-class

 src/Haddock/Backends/Hoogle.hs  |    2 +-
 src/Haddock/Convert.hs          |   32 ++++++++++++++++++--------------
 src/Haddock/Interface/Create.hs |    2 +-
 src/Haddock/Interface/Rename.hs |    7 ++++---
 src/Haddock/Utils.hs            |    8 +++++++-
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --cc src/Haddock/Convert.hs
index cd3d628,b5b905e..7c9a2ee
--- a/src/Haddock/Convert.hs
+++ b/src/Haddock/Convert.hs
@@@ -30,9 -29,9 +30,10 @@@ import DataCo
  import BasicTypes ( TupleSort(..) )
  import TysPrim ( alphaTyVars )
  import TysWiredIn ( listTyConName, eqTyCon )
 +import PrelNames (ipClassName)
  import Bag ( emptyBag )
  import SrcLoc ( Located, noLoc, unLoc )
+ import Data.List( partition )
  
  
  -- the main function here! yay!