merge of '3a2d3525d6188443c195ea295aa262c5e3dccb74'

     and '40fbbc76fa2b3612027b83b97b4e703d113eaa3c'

2 files changed, 108 insertions, 75 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 7fc40a0a64..c0bce117cc 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Split into "noarch" "arch" and "machine" section
+# build "noarch" for only one machine, build "arch" *one* time for each arch and build "machine" for each machine
+
 DO_UCLIBC=0
 
 do_build() {
@@ -37,54 +40,86 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
 }
 
-for machine in beagleboard efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 
+# noarch packages (e.g. PACKAGE_ARCH=all in OE)
+
+BUILD_MACHINE="beagleboard"
+BUILD_CLEAN=""
+BUILD_TARGETS=""
+do_build
+
+# arch packages (no machine specific (sub)packages)
+
+# Architectures:
+# * arm-oabi:  simpad
+# * armv4t:    om-gta01
+# * armv5te:   c7x0
+# * armv6:     nokia800
+# * armv7a:    beagleboard
+# * ppc405:    dht-walnut
+# * ppc603e:   efika
+
+for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika
 do
-        BUILD_MACHINE=$machine
-	BUILD_CLEAN="qmake-native qmake2-native qt-x11-free"
-        BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
-                       gdb gdbserver strace \
+	BUILD_MACHINE=$machine
+	BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python"
+	BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
+	               gdb gdbserver strace \
 		       usbutils pciutils mtd-utils usbview hal setserial \
-                       task-proper-tools mc screen findutils fakeroot gzip \
-	               mono jamvm perl python ruby \
-		       gtk+ qt-x11-free qt4-x11-free \
-		       gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany fennec minimo openmoko-browser2 \
-		       samba meta-nas-server \
-		       apache2 boa cherokee lighttpd thttpd \
-		       gpe-sketchbook gpe-gallery gpe-scap notecase leafpad task-gpe-pim \
-		       pidgin irssi \
-		       roadmap-gtk2 gpsdrive navit viking \
-		       ffmpeg xmms totem mplayer quasar vlc-gpe gnome-mplayer \
-		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
-		       nmap iptables iperf openvpn vpnc \
-		       gpe-login ipaq-sleep \
-		       gpe-bluetooth bluez-gnome python-pybluez \
-		       abiword gnumeric evince epdfview gimp \
-		       scummvm \
-		       flite \
-		       ctorrent \
-		       asterisk \
-		       gnuradio gnuplot mpfr gmp fftw fftwf fftwl \
-		       gphoto2 gqview imagemagick ufraw \
+		       task-proper-tools mc screen findutils fakeroot gzip \
+		       mono jamvm perl python ruby \
+                       gtk+ qt-x11-free qt4-x11-free \
+                       gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany fennec minimo openmoko-browser2 \
+                       samba meta-nas-server \
+                       apache2 boa cherokee lighttpd thttpd \
+                       gpe-sketchbook gpe-gallery gpe-scap notecase leafpad task-gpe-pim \
+                       pidgin irssi \
+                       roadmap-gtk2 gpsdrive navit viking \
+                       ffmpeg xmms totem mplayer quasar vlc-gpe gnome-mplayer \
+                       wpa-gui wifi-radar kismet aircrack-ng dsniff \
+                       nmap iptables iperf openvpn vpnc \
+                       gpe-login ipaq-sleep \
+                       gpe-bluetooth bluez-gnome python-pybluez \
+                       abiword gnumeric evince epdfview gimp \
+                       scummvm \
+                       flite \
+                       ctorrent \
+                       asterisk \
+                       gnuradio gnuplot mpfr gmp fftw fftwf fftwl \
+                       gphoto2 gqview imagemagick ufraw \
                        rdesktop x11vnc tightvnc \
-		       tzdata \
-		       xserver-kdrive xserver-xorg \
-		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
-		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
-		       task-opie task-opie-games task-opie-apps task-opie-all \
-		       konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \
-		       zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \
-		       atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \
-		       pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \
-		       qmatrix qfish2 froot \
-		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
-		       gsm0710muxd frameworkd zhone \
-               gnome-games \
-               mythtv \
-	           ioquake3 quake2 quetoo sdlquake \
-               prboom openredalert \		
-               e-wm \
-               angstrom-x11-base-depends angstrom-zeroconf-audio angstrom-gpe-task-settings \
-"
+                       tzdata \
+                       xserver-kdrive xserver-xorg \
+                       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
+                       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
+                       task-opie-games task-opie-apps \
+                       konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \
+                       zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui qpe-nmap \
+                       atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \
+                       pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \
+                       qmatrix qfish2 froot \
+                       gsm0710muxd frameworkd zhone \
+                       gnome-games \
+                       mythtv \
+                       ioquake3 quake2 quetoo sdlquake \
+                       prboom openredalert \
+                       e-wm \
+                       angstrom-zeroconf-audio
+                       task-openmoko-feed task-openmoko-games \
+                       "
+	do_build
+done	
+
+# machine packages (machine specific (sub)packages)
+
+for machine in beagleboard efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 
+do
+        BUILD_MACHINE=$machine
+	BUILD_CLEAN=""
+	BUILD_TARGETS="task-base task-boot \
+                       task-opie task-opie-all \
+		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
+                       angstrom-x11-base-depends angstrom-gpe-task-settings \
+                       "
 	do_build
 done
 
diff --git a/contrib/mtn2git/manglenames.py b/contrib/mtn2git/manglenames.py
index 3c38d7d2a7..95c0d77799 100755
--- a/contrib/mtn2git/manglenames.py
+++ b/contrib/mtn2git/manglenames.py
@@ -4,28 +4,28 @@
 # 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"),
     "Antti Andreimann"   : (["antti.andreimann@mail.ee", "mailto:antti.andreimann@mail.ee"], "antti.andreimann@mail.ee"),
     "araimondi"          : (["araimondi@gmx.net"], "araimondi@gmx.net"),
-    "Arjan Schrijver"    : (["arjan@openembedded.org"], "arjan@unknown.openembedded.org"),
+    "Arjan Schrijver"    : (["arjan@openembedded.org"], "arjan@anymore.nl"),
     "Bastian Ballmann"   : (["balle@chaostal.de", "Bastian Ballmann <balle@chaostal.de>"], "balle@chaostal.de"),
     "Bernhard Guillon"   : (["Bernhard.Guillon@opensimpad.org", "Bernhard Guillon <Bernhard.Guillon@opensimpad.org>", "Bernhard Guillon <Bernhard.Guillon@opensimpad.org> - close #1874"], "Bernhard.Guillon@opensimpad.org"),
     "Bernhard Rosenkraenzer" : (["bero@arklinux.org"], "bero@arklinux.org"),
     "Bignaux Ronan"      : (["ronan@aimao.org"], "ronan@aimao.org"),
-    "Bruno Randolf"      : (["br1@openembedded.org", "(none)!br1"], "br1@unknown.openembedded.org"),
+    "Bruno Randolf"      : (["br1@openembedded.org", "(none)!br1"], "br1@subnet.at"),
     "Carsten Schneider"  : (["Carsten Schneider <zcarsten@gmx.net>"], "zcarsten@gmx.net"),
     "ccsmart"            : (["ccsmart@openembedded.org", "ccsmart@smartpal.de"], "ccsmart@smartpal.de"),
     "Cesar Eduardo Barros"     : (["cesarb@cesarb.net"], "cesarb@cesarb.net"),
@@ -43,7 +43,7 @@ all_names = {
     "David Karlstrom"    : (["daka@nslu2-linux.org", "daka@thg.se"], "daka@thg.se"),
     "Denys Dmytriyenko"  : (["denis@denix.org"], "denis@denix.org"),
     "Derek Young"        : (["dyoung@nslu2-linux.org", "(none)!dereky", "(none)!dyoung"], "dyoung@nslu2-linux.org"),
-    "Dirk Opfer"         : (["dirk@openembedded.org", "opfer.lan!dirk"], "dirk@unknown.openembedded.org"),
+    "Dirk Opfer"         : (["dirk@openembedded.org", "opfer.lan!dirk"], "dirk@opfer-online.de"),
     "Dmitry Artamonow"   : (["DmitryArtamonow", "mad_soft@inbox.ru"], "mad_soft@inbox.ru"),
     "Dmitry Baryshkov"   : (["Dmitry Baryshkov <dbaryshkov@gmail.com>", "dbaryshkov@gmail.com"], "dbaryshkov@gmail.com"),
     "Dojii Seketeli"     : (["dodji@openedhand.com"], "dodji@openedhand.com"),
@@ -52,9 +52,9 @@ all_names = {
     "Erik Hovland"       : (["erik@openembedded.org", "erik@hovland.org"], "erik@hovland.org"),
     "Esben Haabendal"    : (["eha@doredevelopment.dk"], "eha@doredevelopment.dk"),
     "Fabrice Aeschbacher": (["Fabrice.Aeschbacher@siemens.com"], "Fabrice.Aeschbacher@siemens.com"),
-    "Felix Domke"        : (["tmbinc@openembedded.org"], "tmbinc@unknown.openembedded.org"),
+    "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"),
@@ -87,41 +87,39 @@ all_names = {
     "Jorik Jonker"       : (["jorik@kippendief.biz"], "jorik@kippendief.biz"),
     "José Bernardo de Bandos Rodrigues da Silva" : (["jbs@bandos.homelinux.com"], "jbs@bandos.homelinux.com"),
     "Joseph Cole"        : (["jnc@openembedded.org"], "jnc@unknown.openembedded.org"),
-    "Joshua Wise"        : (["joshuawise.com!joshua"], ""),
+    "Joshua Wise"        : (["joshuawise.com!joshua"], "joshua@joshuawise.com"),
     "jp30"               : (["jp30@nslu2-linux.org"], "jp30@nslu2-linux.org"),
     "Junqian Gordon Xu"  : (["xjqian@gmail.com", "xjqian@openembedded.org"], "xjqian@gmail.com"),
-    "Justin Patrin"      : (["justinp@openembedded.org"], "justinp@unknown.openembedded.org"),
+    "Justin Patrin"      : (["justinp@openembedded.org"], "papercrane@gmail.com"),
     "Kalev Lember"       : (["kalev@smartlink.ee"], "kalev@smartlink.ee"),
     "Karol Sokolowski"   : (["Karol Sokolowski <sokoowpwr@o2.pl>"], "sokoowpwr@o2.pl"),
     "Khem Raj"           : (["khem@openembedded.org", "KhemRaj", "raj.khem@gmail.com"], "raj.khem@gmail.com"),
     "Koen Kooi"          : (["koen@openembedded.org", "(none)!koen", "utwente.nl!koen", "void!koen"], "koen@openembedded.org"),
     "kolla"              : (["kolla@uninett.no"], "kolla@uninett.no"),
-    "Kristoffer Ericson" : (["kristoffer@openembedded.org"], "kristoffer@unknown.openembedded.org"),
+    "Kristoffer Ericson" : (["kristoffer@openembedded.org"], "kristoffer_e1@hotmail.com"),
     "Leon Woestenberg"   : (["likewise@gmx.net", "likewise@openembedded.org"], "leon.woestenberg@gmail.com"),
-    "Leon Zhang"         : (["Leon Zhang"], "leon.zhang@unknown.openembedded.org"),
+    "Leon Zhang"         : (["Leon Zhang"], "leoncamel@gmail.com"),
     "Liam Girdwood"      : (["lrg@openembedded.org"], "liam.girdwood@wolfsonmicro.com"),
-    "Lorn Potter"        : (["trolltech.com.au!lpotter", "(none)!lpotter"], ""), 
+    "Lorn Potter"        : (["trolltech.com.au!lpotter", "(none)!lpotter"], "lpotter@trolltech.com"), 
     "Lukas Gorris"       : (["Lukas Gorris", "lukas.gorris@gmx.de"], "lukas.gorris@gmx.de"),
     "Manuel Teira"       : (["Manuel Teira <manuel.teira@telefonica.net>", "manuel.teira@telefonica.net", "sirfred@openembedded.org"], "manuel.teira@telefonica.net"),
     "Marcin Juszkiewicz" : (["Marcin", "Marcin Juszkiewicz <openembedded@hrw.one.pl>", "Marcin Juzkiewicz <hrw@openembedded.org>", "hrw@openedhand.com", "hrw@openembedded.org", "local!szczepan", "hrw.one.pl!szczepan", "hrw.one.pl!hrw", "local!hrw"], "openembedded@hrw.one.pl"),
     "Marek Vasut"        : (["MarekVasut", "marek.vasut@gmail.com", "Marek Vasut <marek.vasut@gmail.com>", "Marek Vašut <marek.vasut@gmail.com>"], "marek.vasut@gmail.com"),
     "Mark Brown"         : (["broonie@sirena.org.uk", "broonie"], "broonie@sirena.org.uk"),
-    "Martin Dietze"      : (["MartinDietze@openembedded.org"], "martin.dietze@unknown.openembedded.org"),
-    "mas"                : (["mas@ecs.soton.ac.uk"], "mas@ecs.soton.ac.uk"),
-    "mattaw"             : (["mattaw"], "mattaw@unknown.openembedded.org"),
+    "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 Hentges"   : (["coredump2@openembedded.org", "coredump@openembedded.org", "local!CoreDump", "handhelds.org!CoreDump", "local!mhentges"], "coredump@unknown.openembedded.org"),
-    "Matt Reimer"        : (["mreimer@openembedded.org"], "mreimer@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"], "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"),
@@ -131,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"),
@@ -245,14 +243,14 @@ for line in sys.stdin:
         replacement = reverse[g[2]]
     except:
         replacement = None
-        sys.stderr.write("id unkown %s\n" % repr(g[2]))
+        sys.stderr.write("id unknown %s\n" % repr(g[2]))
     if replacement is None:
         if '!' in g[2]:
             replacement = (g[2], g[2] + "@bk.openembedded.invalid")
         elif '@' in g[2]:
             replacement = (g[2], g[2])
         else:
-            raise "id unkown %s" % repr(replacement)
+            raise "id unknown %s" % repr(replacement)
     line = m.expand(r"\1 %s <%s> \4\n" % replacement )
     sys.stdout.write(line)