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

[nucleo]

commit 25dfa5b780847698b106742fcddb1a6350e8698b
Merge: 3c39633 01e0e82
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Aug 30 23:24:41 2011 +0300

    Merge branch 'master' into f14

 .gitignore       |    1 +
 libktorrent.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---