I've temporarily set the Hudson builds to use JDK 1.6 so they can finish.
If we stick with 1.6 on server.. we will probably need two compilation units... so this is definitely just a hack to let the build to finish now.
