644a1b7 Merge with upstream

Authored and Committed by fnasser 17 years ago
    Merge with upstream