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

[Iavor Diatchki]

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

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/92d8daaf1d8cc117788bb100f2d5710d5437f062

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

commit 92d8daaf1d8cc117788bb100f2d5710d5437f062
Merge: 2a15567... 8ebe8cc...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Mon Mar 19 20:09:14 2012 -0700

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

 Data/List.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)