[rtorrent/el6/master: 8/8] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 7c9fc014ff257b7d38b3124ef693daa5e49fa5fe
Merge: b344774 19dda22
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Oct 15 11:17:53 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	rtorrent.spec

 rtorrent-0.8.6-fallocate.patch |   12 ++++++
 rtorrent.libxmlrpcFTBFS.patch  |   26 ++++++++++++
 rtorrent.rc.example            |   84 ----------------------------------------
 rtorrent.spec                  |   27 +++++++++----
 4 files changed, 57 insertions(+), 92 deletions(-)
---