3a18465 Merge branch 'master' into f17

Merged and Committed by rocha 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	dpm-contrib-admintools.spec
    
        
file modified
+4 -1