r652 www/trunk