This finishes off 3.3.

svn path=/trunk/; revision=853