FreeMarkerTree (JTree) didn't show the correct node text.
One of the Java 5 method overrides wasn't commented out, and its return value conflicts with Appendable. This could cause problems.
Merge branch '2.3-gae' into 2.3 (just to "document" that changes from the gae branch before this need not be merged)