r626 www/trunk