d6c9a2f rebase on new upstream

Authored and Committed by Ruediger Landmann 9 years ago
    rebase on new upstream
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -2