[commit: base] master: Merge branch 'master' of http://darcs.haskell.org/packages/base (f07215b)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit f07215b83132b9bc9b0078a0e0940934319f3360
Merge: d9b6b25... 85bda3d...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 24 09:50:04 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org/packages/base

 GHC/TypeLits.hs   |   40 ++++++++++++++++++++++++++++++++++++++++
 tests/qsemn001.hs |    1 -
 2 files changed, 40 insertions(+), 1 deletions(-)