More changes to come. svn path=/trunk/; revision=36247
svn path=/trunk/; revision=35665
svn path=/trunk/; revision=34235