r689 www/trunk