Final commit of all my changes.

svn path=; revision=84326