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

[Iavor Diatchki]

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

On branch  : type-nats

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

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

commit a656b684f4a279463bd7f261f6e7209f72d8ed8e
Merge: 92768c0... 5331b6b...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Feb 12 13:18:19 2012 -0800

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

 Data/Foldable.hs                        |   30 ++++++++++++++++--------------
 base.cabal                              |    2 +-
 tests/Numeric/all.T                     |    2 +-
 tests/Text.Printf/1548.hs               |   11 +++++++++++
 tests/Text.Printf/1548.stdout           |    3 +++
 tests/{Numeric => Text.Printf}/Makefile |    0 
 tests/Text.Printf/all.T                 |    1 +
 7 files changed, 33 insertions(+), 16 deletions(-)