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

[Jens Petersen]

commit c923ac03bb4c57a52b486c08afce48d59a0ed973
Merge: fb02116 dda4336
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 26 11:13:05 2012 +0900

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

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