r498 www/trunk