don't need to have the $FreeBSD$ tag here.
Merge from ix svn
Move up after last move added extra /ix.
