Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Fri, 18 Jan 2013 18:17:32 +0000 (18:17 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 18 Jan 2013 18:17:32 +0000 (18:17 +0000)

Trivial merge