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

[konradm]

commit 2d96f4ae52347ac4aa5f98184d6748cf6598a40f
Merge: ff34b88 0eee841
Author: Conrad Meyer <cemeyer at cs.washington.edu>
Date:   Sun Jul 3 17:11:47 2011 -0700

    Merge branch 'master' into f15

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