===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- www/events.html 2006/03/08 19:27:48 1.460
+++ www/events.html 2006/03/08 20:15:41 1.461
@@ -28,16 +28,6 @@
-- BSDCan 2006,
-May 12 - 13, 2006, Ottawa, Canada.
-David Gwynne will give a talk about hardware monitoring with bio and
-sensors in OpenBSD and Reyk Flöter will talk about the latest
-wireless support and the incredible plans for the future. A number of
-OpenBSD hackers will attend the conference as well, like the committee
-members Bob Beck and Todd Miller.
-
-
-
UKUUG Spring Conference 2006,
Mar 22 - 23, 2006, Durham, United Kingdom
@@ -58,6 +48,16 @@
Boothslaves volunteer at the normal address.
+
- BSDCan 2006,
+May 12 - 13, 2006, Ottawa, Canada.
+David Gwynne will give a talk about hardware monitoring with bio and
+sensors in OpenBSD and Reyk Flöter will talk about the latest
+wireless support and the incredible plans for the future. 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.
@@ -1818,7 +1818,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.460 2006/03/08 19:27:48 reyk Exp $
+
$OpenBSD: events.html,v 1.461 2006/03/08 20:15:41 reyk Exp $