Update to match buildrump.sh: 20130923 1600UTC
Merge branch 'netbsd-cvs'
remove fix done other way in netbsd-cvs