Remove "2006-01-08 Chong Yidong". The change wasn't applied in the trunk.