r873 www/trunk