a16e4a5 rebase to upstream 0.2.11

Authored and Committed by jvcelak 14 years ago
    rebase to upstream 0.2.11
    
        
file modified
+1 -1
file modified
+10 -1