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

[Iavor Diatchki]

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

On branch  : type-nats

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

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

commit cb943a2ff3ab33d050ce0d6b4cee5614c0d3d7a1
Merge: b75362f... c010103...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Tue Jan 24 19:27:15 2012 -0800

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

 Control/Applicative.hs                           |   41 ++++++++++++++--
 Control/Arrow.hs                                 |    7 +++
 Control/Monad/Fix.hs                             |    6 --
 Control/Monad/Instances.hs                       |   22 +--------
 Data/Bits.hs                                     |   56 +++++++++++++++++-----
 Data/Either.hs                                   |    9 ++++
 GHC/Base.lhs                                     |   10 ++++
 GHC/Int.hs                                       |   21 ++++++++-
 GHC/Word.hs                                      |   24 +++++++++
 NHC/SizedTypes.hs                                |    3 +
 tests/Numeric/all.T                              |   10 ++++-
 tests/Numeric/num009.hs                          |   18 ++++----
 tests/Numeric/num009.stdout-i386-unknown-mingw32 |   16 ++++++
 13 files changed, 189 insertions(+), 54 deletions(-)