r697 www/branches/life