78df024 * update to latest upstream

Authored and Committed by topdog 12 years ago
     * update to latest upstream
     * fix #715830
    
        
file modified
+17 -21