[libktorrent/f14/master: 5/5] Merge branch 'master' into f14

[nucleo]

commit 91e3c28045394e5cf2de0d6a9bcabf683e25c55b
Merge: 3226ad0 d18274f
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Mar 15 20:41:49 2011 +0200

    Merge branch 'master' into f14

 .gitignore       |    4 +++-
 libktorrent.spec |   26 +++++++++++++++++++-------
 sources          |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)
---