Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorIavor S. Diatchki <diatchki@Perun.(none)>
Sat, 10 Nov 2012 20:25:24 +0000 (12:25 -0800)
committerIavor S. Diatchki <diatchki@Perun.(none)>
Sat, 10 Nov 2012 20:25:24 +0000 (12:25 -0800)

Trivial merge