51f9320 Merge branch 'f18' into f19

Merged and Committed by cfeist 11 years ago
    Merge branch 'f18' into f19
    
    Conflicts:
    	pcs.spec
    
        
file modified
+1 -0
file added
+42
file modified
+11 -5
file modified
+1 -1