bab2b69 Sync minor changes from rawhide before initial build for EL-6

Authored and Committed by tremble 13 years ago
    Sync minor changes from rawhide before initial build for EL-6