4863a5b Merge branch 'master' into el6

Merged and Committed by fab 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	rednotebook.spec
    
        
file modified
+3 -0
file modified
+1 -1