===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- www/events.html 2006/05/15 09:44:59 1.489
+++ www/events.html 2006/05/15 16:58:58 1.490
@@ -42,18 +42,6 @@
-- BSDCan 2006,
-May 12 - 13, 2006, Ottawa, Canada.
-David Gwynne will give a talk about hardware monitoring with bio and
-sensors in OpenBSD (slides)
-and Reyk Flöter will talk about the latest
-wireless support and the incredible plans for the future, and
-Peter Hansteen will give a PF tutorial. A number of OpenBSD hackers
-will attend the conference as well, like the committee members
-Bob Beck and Todd Miller.
-
-
-
SANE 2006,
May 15 - 19, 2006, Delft, The Netherlands.
@@ -92,6 +80,18 @@
2006
+- BSDCan 2006,
+May 12 - 13, 2006, Ottawa, Canada.
+David Gwynne gave a talk about hardware monitoring with bio and
+sensors in OpenBSD (slides)
+and Reyk Flöter talked about the latest
+wireless support and the incredible plans for the future
+(slides), and
+Peter Hansteen gave a PF tutorial. A number of OpenBSD hackers
+attended the conference as well, like Bob Beck and Mathieu Sauve-Frankel.
+
+
-
Linuxdays 2006,
May 8 - 12, 2006, Geneva, Switzerland.
@@ -1928,7 +1928,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.489 2006/05/15 09:44:59 bernd Exp $
+
$OpenBSD: events.html,v 1.490 2006/05/15 16:58:58 reyk Exp $