e62c7c9 update to latest revision from trunk to backport latest upstream fixes

Authored and Committed by jkaluza 9 years ago
    update to latest revision from trunk to backport latest upstream fixes
    
        
file modified
+1 -0
file modified
+8 -5
file modified
+1 -1