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

[nucleo]

commit 39be1a6a5177f0a0cf70c179bebd25ac9dd90853
Merge: f8549cf 0d59497
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Mar 15 21:24:02 2011 +0200

    Merge branch 'master' into f14

 .gitignore    |    4 +++-
 ktorrent.spec |   33 +++++++++++++++++++++++----------
 sources       |    2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)
---