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

[nucleo]

commit dddeebb6d1f08cd5d8e18389bad7b7b1deac232d
Merge: c998aa0 47f9416
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Aug 30 23:42:25 2011 +0300

    Merge branch 'master' into f14

 .gitignore    |    1 +
 ktorrent.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---