d21d767 brange merge from upstream

2 files Merged by wwoods@kraid.test.redhat.com 17 years ago, Committed by Jesse Keating 17 years ago,
    brange merge from upstream
    
        
file modified
+2 -1
file modified
+16 -15