From: Chris Larson <clarson@kergoth.com>
Date: Thu, 23 Sep 2004 16:35:47 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~16941
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbc58e3910b4cefa75e1a14bc58f6f99f1212460;p=openembedded.git

Merge

2004/09/20 15:01:49-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

BKrev: 4152fb63VeVFTHzhNuBE8WGr1CRx2g
---

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 773b8b7bcb..b487d7d9c7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -45,6 +45,7 @@ mickeyl@allanon.vanille.de
 mickeyl@gandalf.tm.informatik.uni-frankfurt.de
 mickeyl@r2d2.tm.informatik.uni-frankfurt.de
 mithro@mithis.com
+nslu2-linux.adm@hostme.bitkeeper.com
 oe@sugarcube.dyndns.org
 p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)