r870 www/trunk