99cb929 Merge branch 'master' into el6

Merged and Committed by dgoodwin 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	tito.spec
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+39 -2