e61e0d6 Merge branch 'master' into el5

Merged and Committed by pali 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    
        
file modified
+4 -0
file modified
+2 -1
file modified
+90 -9
file modified
+1 -0