8f21a50 - Update from F-12 branch

Authored and Committed by hadess 14 years ago
    - Update from F-12 branch