[commit: base] new-typeable: Merge branch 'master', remote-tracking branch 'origin' into new-typeable (2f10d97)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/2f10d97fa0b20e9c574b308a16d7342946e37654

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

commit 2f10d97fa0b20e9c574b308a16d7342946e37654
Merge: e7336f3... afb8197... 281d906...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Mon Dec 3 09:34:43 2012 +0000

    Merge branch 'master', remote-tracking branch 'origin' into new-typeable

 Data/Data.hs              |   12 ++++++------
 GHC/Event/Thread.hs       |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 GHC/Generics.hs           |   21 ++++++++++++++++++++-
 GHC/TypeLits.hs           |    4 ++--
 System/Posix/Internals.hs |    6 ++++++
 base.cabal                |    3 ++-
 6 files changed, 80 insertions(+), 11 deletions(-)