[libtorrent/el6/master: 5/5] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit a8810ed8f3bcde0fe27b9beeb3945b845139cb4c
Merge: 5cab584 68613ca
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Oct 15 11:16:05 2010 +0200

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

 libtorrent.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---