Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 22:40:50 +0000 (22:40 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 22:40:50 +0000 (22:40 +0000)

Trivial merge