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

[konradm]

commit d7cfc638e24c4a9ba0cb00e600aeb6f6725840e6
Merge: 67aa03c 0eee841
Author: Conrad Meyer <cemeyer at cs.washington.edu>
Date:   Sun Jul 3 17:13:29 2011 -0700

    Merge branch 'master' into f14

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