Merge commit '32f89821' into eclair * commit '32f89821': Remove tests.api.java.io.FileTest#test_delete as known failure.