b4f2890 Merge branch 'master' into el6

Merged and Committed by limb 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	clearsilver.spec
    
        
file modified
+14 -3