Originally committed to SVN as r2315.
Originally committed to SVN as r2309.
Originally committed to SVN as r2306.