[ghc-attempt/f14: 2/2] Merge branch 'master' into f14

[Ben Boeckel]

commit 866052de3377158c52546d46c506cd89f73c60d7
Merge: 0e07730 3becb48
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Wed May 11 21:08:51 2011 -0400

    Merge branch 'master' into f14
    
    * master:
      Update to cabal2spec-0.22.7

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