[libtorrent/f13/master: 3/3] Merge branch 'master' into f13

[Michel Alexandre Salim]

commit 70d5cebfe6adbec942b12cc8230b2a21eb65ff0d
Merge: 768318b 68613ca
Author: Michel Alexandre Salim <michel at hypatia.localdomain>
Date:   Fri Oct 15 11:03:26 2010 +0200

    Merge branch 'master' into f13

 libtorrent.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---