2.25.2

svn path=/trunk/; revision=2780