Adopt latest google collections snapshot (partially); some style cleanup

git-svn-id: https://google-guice.googlecode.com/svn/trunk@504 d779f126-a31b-0410-b53b-1d3aecad763e
42 files changed