435b97c Rebase to 0.9.0 from upstream

Authored and Committed by msuchy 13 years ago
    Rebase to 0.9.0 from upstream
    
        
file modified
+1 -0
file modified
+4 -1