[rtorrent/f13/master: 4/4] Merge branch 'master' into f13

[Michel Alexandre Salim]

commit 299bdbe9df1da8bc6a2a577fb492e2e5ced0aab1
Merge: f96bf7b 19dda22
Author: Michel Alexandre Salim <michel at hypatia.localdomain>
Date:   Fri Oct 15 11:06:25 2010 +0200

    Merge branch 'master' into f13

 rtorrent-0.8.6-fallocate.patch |   12 ++++++
 rtorrent.rc.example            |   84 ----------------------------------------
 rtorrent.spec                  |   16 +++++--
 3 files changed, 23 insertions(+), 89 deletions(-)
---