r817 www/trunk