Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Sun, 4 Dec 2011 15:34:59 +0000 (15:34 +0000)
committerIan Lynagh <igloo@earth.li>
Sun, 4 Dec 2011 15:34:59 +0000 (15:34 +0000)

Trivial merge