r683 www/branches/life