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

--HG--
extra : transplant_source : %C5%7D%89wzQ%CA%2C%88%CB%5B%CA%96%27%B8%C6%3D%17%81%C2