b77f8b Sync from git

Authored and Committed by Mark McLoughlin 15 years ago
    Sync from git