250682f Merge remote-tracking branch 'origin/f16'

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/f16'
    
    Conflicts:
    	shared-mime-info.spec
    
        
file modified
+3 -3
file modified
+7 -1