Minor cleanup
Merge branch 'master' of ssh://git.java.net/hk2~git