3be48f fix type transition conflicts

Authored and Committed by Chris PeBenito 19 years ago
    fix type transition conflicts