===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- www/events.html	2006/06/02 11:13:43	1.501
+++ www/events.html	2006/06/04 10:29:33	1.502
@@ -42,23 +42,6 @@
 
 <ul>
 
-<li><strong><a name=LinuxwochenVienna2006></a>
-<a href="http://www.linuxwochen.at/2006/Wien">Linuxwochen Vienna 2006</a>
-</strong>,
-May 31 - Jun 2, 2006, Vienna, Austria.<br>
-There will be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
-Boothslaves volunteer at the normal address.
-<p>
-
-<li><strong><a name=Slackathon2006></a>
-<a href="http://slackathon2006.unix.se">Slackathon 2006</a>
-</strong>
-Jun 3, 2006, Stockholm, Sweden.<br>
-A fundraiser for OpenBSD/SSH at the Stockholm University. Free entrance and all
-donations go straigth to the project. Several developers will talk about 
-OpenBSD here, as well as some hands-on workshops with both old and new hardware.
-<p>
-
 <li><strong><a name=lugverona2006></a>
 <a href="http://www.di.univr.it/dol/main?ent=iniziativa&id=857&lang=it">LUGVR@UNIVR</a></strong>
 Jun 9, 2006, Verona University, Borgo Roma, Italy.<br>
@@ -92,6 +75,16 @@
 There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
 suspects, with the help of Serge Basterot and Alexandre Anriot.
 <p>
+
+<li><strong><a name="opencon2006"</a>
+<a href="http://www.opencon.org/">OpenCON 2006</a></strong>
+Dec 2 - 3, 2006, Venice Gateway for For Science and Technology (VEGA),
+Venice/Mestre, Italy<br>
+OpenCON is the only conference dedicated solely to OpenBSD.  There will
+be talks by OpenSBD developers and an OpenBSD and OpenSSH booth run by
+Wim and the usual suspects.
+<p>
+
 </ul>
 
 <hr>
@@ -101,6 +94,23 @@
 <h3>2006</h3>
 <ul>
 
+<li><strong><a name=Slackathon2006></a>
+<a href="http://slackathon2006.unix.se">Slackathon 2006</a>
+</strong>
+Jun 3, 2006, Stockholm, Sweden.<br>
+A fundraiser for OpenBSD/SSH held at the Stockholm University. Free
+entrance and all donations went straigth to the project. Several
+developers were talking about OpenBSD here, as well as some hands-on
+workshops took place with both old and new hardware.
+<p>
+
+<li><strong><a name=LinuxwochenVienna2006></a>
+<a href="http://www.linuxwochen.at/2006/Wien">Linuxwochen Vienna 2006</a>
+</strong>,
+May 31 - Jun 2, 2006, Vienna, Austria.<br>
+There was an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
+<p>
+
 <li><strong><a name=cuug2006></a>
 <a href="http://www.cuug.ab.ca/">Calgary Unix Users Group</a></strong>,
 Jun 1, 2006, SAIT Campus, Calgary, Alberta.<br>
@@ -1966,7 +1976,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: events.html,v 1.501 2006/06/02 11:13:43 wvdputte Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.502 2006/06/04 10:29:33 mbalmer Exp $</small>
 
 </body>
 </html>