mergme


[SVN r53280]