r681 www/trunk