26e8121 upstream 1.1.1

Authored and Committed by cdamian 14 years ago
    upstream 1.1.1