[ghc/f14/master: 4/4] Merge remote branch 'origin/master' into f14/master

[Jens Petersen]

commit 63d6d4e0608f3f04a81bcaf102fb8955c8c66416
Merge: decc0d3 9648738
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Sep 30 20:24:29 2010 +1000

    Merge remote branch 'origin/master' into f14/master

 ghc.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---