mtn2git: fix some more adresses

1 files changed, 14 insertions, 15 deletions

diff --git a/contrib/mtn2git/manglenames.py b/contrib/mtn2git/manglenames.py
index ddf9026405..95c0d77799 100755
--- a/contrib/mtn2git/manglenames.py
+++ b/contrib/mtn2git/manglenames.py
@@ -4,17 +4,17 @@
 # realname : ([keynames], "email address")
 
 all_names = {
-    "Adrian Davey"       : (["ade@openembedded.org"], "ade@unknown.openembedded.org"),
+    "Adrian Davey"       : (["ade@openembedded.org"], "ade@beth2.org"),
     "Alan Carvalho de Assis"  : (["acassis@gmail.com"], "acassis@gmail.com"),
     "Alessandro Gardich" : (["gremlin@gremlin.it"], "gremlin@gremlin.it"),
     "Alessandro Iurlano" : (["Alessandro Iurlano alessandro.iurlano@gmail.com", "alessandro.iurlano@gmail.com"], "alessandro.iurlano@gmail.com"),
     "Alexander Hanff"    : (["core.ldf@gmail.com"], "core.ldf@gmail.com"),
     "Alexis Maldonado "  : (["Alexis Maldonado <maldonad@cs.tum.edu>"], "maldonad@cs.tum.edu"),
     "Alex Lange"         : (["Alex Lange"], "chicken@handhelds.org"),
-    "Alex Osborne"       : (["Alex Osborne"], "alex.osborne@unknown.openembedded.org"),
+    "Alex Osborne"       : (["Alex Osborne"], "ato@meshy.org"),
     "Andrea Adami"       : (["andrea.adami@gmail.com"], "andrea.adami@gmail.com"),
     "Andrew Paulsen"     : (["andrew.paulsen@gmail.com"], "andrew.paulsen@gmail.com"),
-    "Andrew Wilcox"      : (["awilcox@openembedded.org"], "awilcox@unknown.openembedded.org"),
+    "Andrew Wilcox"      : (["awilcox@openembedded.org"], "andy@protium.com"),
     "Angus Ainslie"      : (["angus@handheldshell.com"], "angus@handheldshell.com"),
     "ant"                : (["ant", "ant, Jay"], "ant@unknown.openembedded.org"),
     "Antonio ospite"     : (["ospite@studenti.unina.it"], "ospite@studenti.unina.it"),
@@ -54,7 +54,7 @@ all_names = {
     "Fabrice Aeschbacher": (["Fabrice.Aeschbacher@siemens.com"], "Fabrice.Aeschbacher@siemens.com"),
     "Felix Domke"        : (["tmbinc@openembedded.org"], "tmbinc@elitedvb.ne"),
     "Florian Boor"       : (["florian@openembedded.org"], "florian.boor@kernelconcepts.de"),
-    "Frans Meulenbroeks" : (["eFfeM@openembedded.org"], "effem@unknown.openembedded.org"),
+    "Frans Meulenbroeks" : (["eFfeM@openembedded.org"], "fransmeulenbroeks@yahoo.com"),
     "Frederic Bompart"   : (["frederic@openembedded.org"], "frederic@unknown.openembedded.org"),
     "Geoffrey Wossum"    : (["gwossum", "gwossum@acm.org", "geoffrey.wossum"], "gwossum@acm.org"),
     "Gerald Britton"     : (["doomcom.org!gbritton", "org[gbritton]!gbritton"], "gbritton@doomcom.org"),
@@ -78,7 +78,7 @@ all_names = {
     "Jamie Lenehan"      : (["lenehan@openembedded.org", "lenehan@twibble.org"], "lenehan@twibble.org"),
     "Jan Lübbe"          : (["jluebbe@lasnet.de", "jluebbe@openembedded.org"], "jluebbe@debian.org"),
     "Jeremy Laine"       : (["jemery_laine", "Jereme_Laine", "Jeremy_Laine", "jeremy.laine@m4x.org", "jeremy_laine@openembedded.org", "jeremy_laine"], "jeremy.laine@m4x.org"),
-    "Jeroen Hoek"        : (["Jeroen Hoek"], "jeroen.hoek@unknown.openembedded.org"),
+    "Jeroen Hoek"        : (["Jeroen Hoek"], "mail@jeroenhoek.nl"),
     "Joaquim Duran"      : (["Joaquim Duran <joaquinduran@adtelecom.es>", "joaquinduran@adtelecom.es"], "joaquinduran@adtelecom.es"),
     "John Bowler"        : (["jbowler@nslu2-linux.org", "kalmiopsis!jbowler"], "jbowler@nslu2-linux.org"),
     "John Lee"           : (["john_lee@openembedded.org", "john_lee@openmoko.com"], "john_lee@openmoko.org"),
@@ -109,18 +109,17 @@ all_names = {
     "Martin Dietze"      : (["MartinDietze@openembedded.org"], "di@fh-wedel.de"),
     "Matthew Swabey"     : (["mas@ecs.soton.ac.uk", "mattaw"], "mas@ecs.soton.ac.uk"),
     "Matthew Allum"      : (["(none)!mallum"], "mallum@openedhand.com"),
-    "Matthias Goebl"     : (["mgoebl@openembedded.org"], "mgoebl@unknown.openembedded.org"),
+    "Matthias Goebl"     : (["mgoebl@openembedded.org"], "oe@m.goebl.net"),
     "Matthias Hentges"   : (["coredump2@openembedded.org", "coredump@openembedded.org", "local!CoreDump", "handhelds.org!CoreDump", "local!mhentges"], "oe@hentges.net"),
-    "Matt Reimer"        : (["mreimer@openembedded.org"], "mreimer@unknown.openembedded.org"),
+    "Matt Reimer"        : (["mreimer@openembedded.org"], "mattjreimer@gmail.com"),
     "Michael Krelin"     : (["polyonymous", "polyonymous@klever.net", "polyonymous@openembedded.org"], "hacker@klever.net"),
     "Michael Lauer"      : (["mickeyl", "mickeyl@openembedded.org", "uni-frankfurt.de!mickeyl", "uni-frankfurt.de!mickey", "uni-frankfurt.de!patch", "vanille.de!mickey", "vanille.de!mickeyl", "de[mickey]!mickey", "de[mickey]!mickeyl"], "mickey@vanille-media.de"),
     "Michael-Luke Jones" : (["blaster8@nslu2-linux.org"], "mlj28@cam.ac.uk"),
     "Michal Panczyk"     : (["mpanczyk@gmail.com"], "mpanczyk@gmail.com"),
-    "MIka Laitio"        : (["lamikr@openembedded.org"], "lamikr@unknown.openembedded.org"),
+    "Mika Laitio"        : (["lamikr@openembedded.org"], "lamikr@cc.jyu.fi"),
     "Mike Montour"       : (["mail@mmontour.net"], "mail@mmontour.net"),
     "Mike Westerhof"     : (["mwester@openembedded.org", "mwester@wraith"], "mwester@dls.net"),
-    "Mustafa Yuecel"     : (["yuecelm@nslu2-linux.org", "yuecelm@openembedded.org"], "yuecelm@ee.ethz.ch"),
-    "musti"              : (["musti@openembedded.org"], "musti@unknown.openembedded.org"),
+    "Mustafa Yuecel"     : (["yuecelm@nslu2-linux.org", "yuecelm@openembedded.org", "musti@openembedded.org"], "yuecelm@ee.ethz.ch"),
     "Nicolas Ferre"      : (["nicolas.ferre@atmel.com", "nicolas.ferre@rfo.atmel.com", "nicolasfr@gmail.com", "Enodr <nicolasfr@gmail.com>"], "nicolasfr@gmail.com"),
     "Nigel Kostiuck"     : (["labotomy.net!emte", "(none)!emte"], "emte@labotomy.net"),
     "Oliver Fels"        : (["oliver.fels@gmx.net", "Oliver Fels <oliver.fels@gmx.net>"], "oliver.fels@gmx.net"),
@@ -130,21 +129,21 @@ all_names = {
     "Otavio Salvador"    : (["otavio@ossystems.com.br", "Otavio Salvador <otavio@debian.org>", "Otavio Salvador <otavio@ossystems.com.br>"], "otavio@ossystems.com.br"),
     "Ovidiu Sas"         : (["osas@nslu2-linux.org"], "sip.nslu@gmail.com"),
     "Oyvind Repvik"      : (["nail@nslu2-linux.org", "oyvind@repvik.org"], "nail@nslu2-linux.org"),
-    "Patrick Ohly"       : (["pohly@openembedded.org"], "pohly@unknown.openembedded.org"),
+    "Patrick Ohly"       : (["pohly@openembedded.org"], "patrick.ohly@gmx.de"),
     "Patrick Steiner"    : (["law@a1.net", "law@openembedded.org", "Patrick Steiner <law@a1.net>", "Patrick Steiner <patrick.steiner@a1.net>"], "law@a1.net"),
     "Patrik Gfeller"     : (["Patrik Gfeller <gfellerpatrik@gmx.net>", "gfellerpatrik@gmx.net"], "gfellerpatrik@gmx.net"),
     "Paul Eggleton"      : (["bluelightning", "bluelightning@bluelightning.org", "bluelightning@openembedded.org", "Paul Eggleton"], "bluelightning@bluelightning.org"),
     "Paul Sokolovsky"    : (["pfalcon@openembedded.org", "pmiscml@gmail.com"], "pmiscml@gmail.com"),
-    "Peter Urbanec"      : (["peteru@openembedded.org"], "peteru@unknown.openembedded.org"),
+    "Peter Urbanec"      : (["peteru@openembedded.org"], "toppy@urbanec.net"),
     "Petr Stetiar"       : (["ynezz@true.cz", "PetrŠtetiar"], "ynezz@true.cz"),
-    "Phil Blundell"      : (["pb@openembedded.org", "nexus.co.uk!pb", "(none)!pb", "uk[pb]!pb", "reciva.com!pb"], "pb@unknown.openembedded.org"),
+    "Phil Blundell"      : (["pb@openembedded.org", "nexus.co.uk!pb", "(none)!pb", "uk[pb]!pb", "reciva.com!pb"], "pb@reciva.com"),
     "Philip Balister"    : (["crofton@openembedded.org"], "philip@balister.org"),
-    "Philippe De Swert"  : (["philippe@openembedded.org"], "philippe@unknown.openembedded.org"),
+    "Philippe De Swert"  : (["philippe@openembedded.org"], "philippedeswert@scarlet.be"),
     "Philipp Zabel"      : (["ph5@openembedded.org", "pH5@openembedded.org"], "philipp.zabel@gmail.com"),
     "Pieter G"           : (["pieterg@gmx.com"], "pieterg@gmx.com"),
     "Purdyd"             : (["purdyd_at_wisheights@yahoo.com"], "purdyd_at_wisheights@yahoo.com"),
     "Raymond Danks"      : (["raymond@edanks.com"], "raymond@edanks.com"),
-    "Rene Wagner"        : (["rw@openembedded.org", "dyndns.org!oe", "dyndns.org!reenoo"], "rw@unknown.openembedded.org"),
+    "Rene Wagner"        : (["rw@openembedded.org", "dyndns.org!oe", "dyndns.org!reenoo"], "rw@handhelds.org"),
     "Richard Purdie"     : (["rpurdie@openembedded.org", "rpurdie@rpsys.net", "rpsys.net!RP", "example.net!RP", "rpsys.net!anon", "rpsys.net!root", "example.net!root"], "rpurdie@rpsys.net"),
     "Rick Farina"        : (["Zero_Chaos", "Zero_Chaos <sidhayn@hotmail.com>"], "sidhayn@hotmail.com"),
     "Robert Demski"      : (["Robert Demski <Robert.Demski@wp.pl>"], "Robert.Demski@wp.pl"),