Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Fri, 23 Nov 2012 18:04:14 +0000 (18:04 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 23 Nov 2012 18:04:14 +0000 (18:04 +0000)

Trivial merge