r824 www/trunk