1b0f42a Sync with current F19 (sans the rebuild bump)

Merged and Committed by rathann 11 years ago
    Sync with current F19 (sans the rebuild bump)
    
    Merge commit '7d404fe6a3d0750ad86cd99965483d6e8fbd2c60' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file removed
-21
abcde-2.4.0-config.patch abcde-2.3.99.8-config.patch
file renamed
+16 -16
file modified
+60 -44
file modified
+1 -1