tree 0a0de19d5d374709c4965ef5db98cfc000cca831
parent aef524a6376eb8189d685d358a8e225cd42397a3
author sberlin@gmail.com <sberlin@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> 1280692156 +0000
committer sberlin@gmail.com <sberlin@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> 1280692156 +0000

Merge 2.0-maven branch into trunk.

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