215ccd3 Merge commit '5f50571' into el6

Merged and Committed by stevetraylen 13 years ago
    Merge commit '5f50571' into el6