b1ecab7 Merge branch 'el6'

Merged and Committed by mcepl 9 years ago
    Merge branch 'el6'
    
    Conflicts:
    	python-urllib2_kerberos.spec
    
        
file modified
+10 -1