mergme

svn path=; revision=53280