Merge branch 'master' of http://darcs.haskell.org/ghc
authorU-EUROPE\dimitris <dimitris@MSRC-1361792.europe.corp.microsoft.com>
Wed, 27 Apr 2011 10:04:52 +0000 (11:04 +0100)
committerU-EUROPE\dimitris <dimitris@MSRC-1361792.europe.corp.microsoft.com>
Wed, 27 Apr 2011 10:04:52 +0000 (11:04 +0100)

Trivial merge