[commit: base] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (b75362f)

[Iavor Diatchki]

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

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/b75362f5cb7a943da0dcb10a6571584d0d78bbc8

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

commit b75362f5cb7a943da0dcb10a6571584d0d78bbc8
Merge: 1eba0a9... f4b7124...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sat Jan 7 13:57:02 2012 -0800

    Merge remote-tracking branch 'origin/master' into type-nats

 Control/Concurrent.hs  |    1 +
 Control/Monad/Group.hs |   36 ------------------------------------
 Data/Monoid.hs         |    8 ++++++++
 base.cabal             |    1 -
 4 files changed, 9 insertions(+), 37 deletions(-)