Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorIavor S. Diatchki <diatchki@galois.com>
Fri, 30 Nov 2012 01:59:02 +0000 (17:59 -0800)
committerIavor S. Diatchki <diatchki@galois.com>
Fri, 30 Nov 2012 01:59:02 +0000 (17:59 -0800)

Trivial merge