Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 6 Apr 2013 18:03:42 +0000 (19:03 +0100)
committerIan Lynagh <ian@well-typed.com>
Sat, 6 Apr 2013 18:03:42 +0000 (19:03 +0100)

Trivial merge