r629 www/trunk