r659 www/branches/life