97e05f3 Rebased to sync with upstream's official 0.10 release

Authored and Committed by Nuno Santos 13 years ago
    Rebased to sync with upstream's official 0.10 release
    
        
file added
+13
file modified
+2 -0