Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorJan Stolarek <jan.stolarek@p.lodz.pl>
Wed, 31 Jul 2013 11:37:50 +0000 (12:37 +0100)
committerJan Stolarek <jan.stolarek@p.lodz.pl>
Wed, 31 Jul 2013 11:37:50 +0000 (12:37 +0100)

Trivial merge