Merge branch 'master' of /home/simonmar/ghc-mirror/ghc
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 4 Nov 2011 10:23:59 +0000 (10:23 +0000)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 4 Nov 2011 10:23:59 +0000 (10:23 +0000)

Trivial merge