81bdb98 Merge branch 'master' into el4

Merged and Committed by bojan 12 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	sources
    	viewvc.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+4 -1