smuir = Steve Muir <smuir@cs.princeton.edu>
soltesz = Stephen Soltesz <soltesz@cs.princeton.edu>
ssevinc = Soner Sevinc <ssevinc@cs.princeton.edu>
-thierry = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
-Thierry Parmentelat = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+thierry = Thierry Parmentelat <thierry.parmentelat@inria.fr>
+Thierry Parmentelat = Thierry Parmentelat <thierry.parmentelat@inria.fr>
tmack = Tony Mack <tmack@cs.princeton.edu>
tmitchell = Tom Mitchell <tmitchel@bbn.com>
valas = Vytautas Valancius <valas@gatech.edu>
xcuvellier = Xavier Cuvellier <Xavier.Cuvellier@lip6.fr>
mchaoui = mchaoui
-(no author) = Planet-Lab Support <support@planet-lab.org>
\ No newline at end of file
+sjm = Steve Muir <smuir@cs.princeton.edu>
+sjm-pl_sshd = Steve Muir <smuir@cs.princeton.edu>
+mlh-pl_sshd = Mark Huang <mlhuang@cs.princeton.edu>
+(no author) = Planet-Lab Support <support@planet-lab.org>