Applying 2 of 3 fixes from chris.nokleberg's code review...

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