aba1705 Merge branch 'master' into f15

Merged and Committed by bojan 13 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	apr-util.spec
    
        
file modified
+5 -0
file modified
+5 -2
file modified
+1 -1