a43708b Merge branch 'f17'

Merged and Committed by rdieter 12 years ago
    Merge branch 'f17'
    
    Conflicts:
    	libktorrent.spec
    
        
file modified
+4 -1