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

[Jens Petersen]

commit 7f512f4d2e5ca319a5ad288edcc4bf6696879ae0
Merge: 1e273b4 bb76f11
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Oct 1 14:34:21 2010 +1000

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

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