2.1, r259 with patches, re-compiled for Java 5