r476 www/trunk