r679 www/trunk