afd5a5c Merge branch 'f18'

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'f18'