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

[Michel Alexandre Salim]

commit e973c0583ed5976a4f1118010e4f64a3a970fb26
Merge: 299bdbe ff09b53
Author: Michel Alexandre Salim <michel at hypatia.localdomain>
Date:   Fri Oct 15 11:27:10 2010 +0200

    Merge branch 'master' into f13

 rtorrent.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---