5fbc5c1 Merge branch 'master' into f17

Merged and Committed by hannes 11 years ago
    Merge branch 'master' into f17
    
    update to 2.5.1
    build fix on other arches
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+13 -3