Minor fixups so that the compilation will succeed.  These were my fault since I had Jonathon check them in prior to testing them.
Minor fixups so that the compilation will succeed.  These were my fault
since I had Jonathon check them in prior to testing them.

nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome