DMESG ERROR: "hints file version mismatch 2214131"

looked in /usr/src/sys/kern/kern_linker.c

found:
<snip>
static char linker_hintfile[] = "linker.hints";
static char linker_path[MAXPATHLEN] = "/boot/kernel;/boot/modules";
<snip>
        if (ival != LINKER_HINTS_VERSION) {
                printf("hints file version mismatch %d\n", ival);
                goto bad;
        }

/boot/kernel$ file linker.hints 
linker.hints: GLS_BINARY_LSB_FIRST

I did a cvsup of the source tree and did a:

make buildworld 
make buildkernel
make installkernel

Reboot into single user mode

mount / (so / can be rw)

cd /usr/src

mergemaster -p

make installworld

mergemaster -i

sync;sync;reboot

Now uname -a gives:

FreeBSD hostname.domain.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Wed Dec  6 21:04:56 EST 2006     root@hostname.domain.com:/usr/obj/usr/src/sys/hero  i386