[cabal-install/f15: 5/5] Merge remote-tracking branch 'origin/f16' into f15

[Jens Petersen]

commit fb021166aeff4207efe968831a8fcc2c07c79577
Merge: fd994c1 c70fbfd
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jan 16 17:18:47 2012 +0900

    Merge remote-tracking branch 'origin/f16' into f15

 cabal-install.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---