Ready to ship

svn path=/trunk/; revision=3112