Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 8 Dec 2012 16:43:13 +0000 (16:43 +0000)
committerIan Lynagh <ian@well-typed.com>
Sat, 8 Dec 2012 16:43:13 +0000 (16:43 +0000)

Trivial merge