===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- www/events.html 2006/04/30 00:12:02 1.482
+++ www/events.html 2006/04/30 13:34:03 1.483
@@ -54,6 +54,13 @@
First event in Brazil totally dedicated to OpenBSD.
+
+Linuxdays 2006,
+May 8 - 12, 2006, Geneva, Switzerland.
+There will be an OpenBSD and OpenSSH booth run by Wim and Marc Balmer on the Wednesday and Thursday.
+A talk will be given by Julien Mabillard, a long-time Geneva OpenBSD user, to present the overall system and its great features.
+
+
BSDCan 2006,
May 12 - 13, 2006, Ottawa, Canada.
@@ -1884,7 +1891,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.482 2006/04/30 00:12:02 pedro Exp $
+
$OpenBSD: events.html,v 1.483 2006/04/30 13:34:03 wvdputte Exp $