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

Trivial merge