===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- www/events.html 2006/02/08 13:13:32 1.453
+++ www/events.html 2006/02/08 13:17:34 1.454
@@ -35,6 +35,12 @@
Wim with help from Guillaume Arcas and Christophe Plasschaert.
+
+NANOG 36,
+Feb 12 - 15, 2006, Dallas, USA.
+Henning Brauer will talk about OpenBGPD and OpenBGPD at DE-CIX.
+
+
Merciful briefings 2006,
Feb 15, 2006, Las Vegas, USA - Feb 17, 2006, San Diego, USA - Feb 18, 2006, Phoenix, USA.
@@ -52,8 +58,8 @@
LinuxForum 2006,
Mar 3 - 4, 2006, Copenhagen
Wim and Felix Kronlage will hold a talk about OpenBSD Mobile Use (wifi, UMTS,
-GPRS, phones and the like) with some demo setups. Henning will talk about
-OpenBGPD.
+GPRS, phones and the like) with some demo setups. Henning Brauer will talk
+about OpenBGPD.
@@ -1785,7 +1791,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.453 2006/02/08 13:13:32 henning Exp $
+
$OpenBSD: events.html,v 1.454 2006/02/08 13:17:34 henning Exp $