explicit diamond args for java6
java6 build
Merge branch 'master' into allenday
add NCSA formatter