7a5e2d trunk: 12 patches from dan.

Authored and Committed by Chris PeBenito 17 years ago
    trunk: 12 patches from dan.