r825 www/trunk