[commit: ghc] type-nats: Merge branch 'type-nats' of git://git.haskell.org/ghc into type-nats (1a71c4d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : type-nats
Link       : http://ghc.haskell.org/trac/ghc/changeset/1a71c4d1da1d1731d4b21229b622f9c2e2ae092c/ghc

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

commit 1a71c4d1da1d1731d4b21229b622f9c2e2ae092c
Merge: 55113db 7c4c48c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Aug 29 16:14:26 2013 +0100

    Merge branch 'type-nats' of git://git.haskell.org/ghc into type-nats
    
    Conflicts:
    	compiler/types/Coercion.lhs



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1a71c4d1da1d1731d4b21229b622f9c2e2ae092c