r871 www/trunk