please do not commit to trunk

Please refrain from committing anything until Eliot can run his Spur
bootstrap one last time and I can build the 5.0 image.  That way
they'll be at exactly the same commit number, 15101.

Thanks for your patience, alllllllllmost done......   :)