256cfc - Update from upstream

Authored and Committed by dwalsh 13 years ago
    - Update from upstream
    - More java fixes
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1