830c12 apply contested part of russell's last patch

Authored and Committed by Chris PeBenito 18 years ago
    apply contested part of russell's last patch