1e16ecc backport GCC 5 fixes from upstream ML: RHBZ #1263988, #1264012

Authored and Committed by adamwill 8 years ago
    backport GCC 5 fixes from upstream ML: RHBZ #1263988, #1264012
    
        
file modified
+10 -1