667e801 Sync from F-13:

Authored and Committed by kkofler 13 years ago
    Sync from F-13:
    Tue Jun 08 2010 Than Ngo <than@redhat.com> - 4.4.4-2
    - fix file conflict with ktorrent
    Sun May 30 2010 Than Ngo <than@redhat.com> - 4.4.4-1
    - 4.4.4
    
        
file modified
+58 -0
file modified
+18 -8
file modified
+58 -58