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

[Jens Petersen]

commit 1e273b4ce551768396172989e23355b264074981
Merge: 63d6d4e 9a030f8
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Oct 1 14:00:22 2010 +1000

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

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