d6fa145 Merge branch 'master' into el6

Merged and Committed by rdieter 12 years ago
    Merge branch 'master' into el6