Index: extract_data
===================================================================
--- extract_data	(revision 2266)
+++ extract_data	(working copy)
@@ -19,6 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import os, sys, sets, ldap
+import os.path
 import apt_pkg
 
 # activity-* fields from LDAP are private
@@ -328,6 +329,11 @@
 merge("ldap:jcs", "email:jorg.schuler@gmx.de")
 merge("ldap:vizzie", "email:vizzie@airmail.net")
 merge("email:jnelson@boa.org", "email:john@debian.org")
+if os.path.exists("/srv/nm.debian.org/mbox/carnivore"):
+    for line in open("/srv/nm.debian.org/mbox/carnivore"):
+        toks = line.strip().split()
+        if len(toks) != 2: continue
+        merge(toks[0], toks[1])
 cleanUp()
 
 out = open('uids.new', 'w')