2ec87f0 Merge branch 'master' into f14

Merged and Committed by ajax 13 years ago
    Merge branch 'master' into f14