r617 www/trunk