r624 www/trunk