Build on CentOS 5 fails
Merge branch 'cento5-noarch-fails'