3549be1 Merge with upstream

Authored and Committed by fnasser 17 years ago
    Merge with upstream