Make compatible with Guava 16.0.
Merge pull request #514 from alanw/master

Make compatible with Guava 16.0.