Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics

Resolved conflicts:
	compiler/typecheck/TcTyClsDecls.lhs

diff --cc compiler/basicTypes/MkId.lhs
Simple merge

diff --cc compiler/deSugar/Check.lhs
Simple merge

diff --cc compiler/hsSyn/HsBinds.lhs
Simple merge

diff --cc compiler/hsSyn/HsPat.lhs
Simple merge

diff --cc compiler/hsSyn/HsUtils.lhs
Simple merge

diff --cc compiler/iface/BinIface.hs
Simple merge

diff --cc compiler/iface/BuildTyCl.lhs
Simple merge

diff --cc compiler/iface/IfaceSyn.lhs
Simple merge

diff --cc compiler/iface/MkIface.lhs
Simple merge

diff --cc compiler/iface/TcIface.lhs
Simple merge

diff --cc compiler/main/DynFlags.hs
Simple merge

diff --cc compiler/prelude/PrelNames.lhs
Simple merge

diff --cc compiler/prelude/TysWiredIn.lhs
Simple merge

diff --cc compiler/rename/RnBinds.lhs
Simple merge

diff --cc compiler/rename/RnTypes.lhs
Simple merge

diff --cc compiler/typecheck/TcDeriv.lhs
Simple merge

diff --cc compiler/typecheck/TcEnv.lhs
Simple merge

diff --cc compiler/typecheck/TcGenDeriv.lhs
Simple merge

diff --cc compiler/typecheck/TcHsType.lhs
Simple merge

diff --cc compiler/typecheck/TcInstDcls.lhs
Simple merge

diff --cc compiler/typecheck/TcPat.lhs
Simple merge

diff --cc compiler/typecheck/TcRnDriver.lhs
Simple merge

diff --cc compiler/typecheck/TcSMonad.lhs
Simple merge

diff --cc compiler/typecheck/TcTyClsDecls.lhs
index cb16097,56bf758..43a0da7
--- 1/compiler/typecheck/TcTyClsDecls.lhs
--- 2/compiler/typecheck/TcTyClsDecls.lhs
+++ b/compiler/typecheck/TcTyClsDecls.lhs
@@@ -665,8 -479,8 +484,7 @@@ tcTyClDecl1 _parent calc_isre
    { extra_tvs <- tcDataKindSig mb_ksig
    ; let final_tvs = tvs' ++ extra_tvs
    ; stupid_theta <- tcHsKindedContext ctxt
 -  ; want_generic <- xoptM Opt_Generics
    ; unbox_strict <- doptM Opt_UnboxStrictFields
-   ; empty_data_decls <- xoptM Opt_EmptyDataDecls
    ; kind_signatures <- xoptM Opt_KindSignatures
    ; existential_ok <- xoptM Opt_ExistentialQuantification
    ; gadt_ok      <- xoptM Opt_GADTs

diff --cc compiler/types/TyCon.lhs
index 5804d49,1d8d48a..9152076
--- 1/compiler/types/TyCon.lhs
--- 2/compiler/types/TyCon.lhs
+++ b/compiler/types/TyCon.lhs
@@@ -63,11 -63,11 +63,11 @@@ module TyCon
          tyConParent,
        tyConClass_maybe,
        tyConFamInst_maybe, tyConFamilyCoercion_maybe,tyConFamInstSig_maybe,
-       synTyConDefn, synTyConRhs, synTyConType, 
-       tyConExtName,           -- External name for foreign types
+         synTyConDefn, synTyConRhs, synTyConType,
+         tyConExtName,           -- External name for foreign types
        algTyConRhs,
          newTyConRhs, newTyConEtadRhs, unwrapNewTyCon_maybe, 
 -        tupleTyConBoxity,
 +        tupleTyConBoxity, tupleTyConArity,
  
          -- ** Manipulating TyCons
        tcExpandTyCon_maybe, coreExpandTyCon_maybe,

diff --cc compiler/types/Type.lhs
Simple merge

diff --cc docs/users_guide/flags.xml
Simple merge