Bug 830371: Put the kernel in the right place. r=nthomas a=akeybl DONTBUILD