===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- www/events.html	2005/04/15 07:19:47	1.351
+++ www/events.html	2005/04/15 14:16:43	1.352
@@ -26,21 +26,6 @@
 
 <ul>
 
-<li><strong><a name=nuug140405></a>
-<a href="http://www.nuug.no/aktiviteter/20050414-pf-brannmur/">Firewalling with PF at NUUG</a></strong>,
-April 14, 2005, Oslo, Norway.<br>
-Peter N. M. Hansteen will give a firewalling with PF talk - hopefully
-giving you some ideas about how to control your network traffic the
-way you want - keeping some things outside your network, directing
-traffic to specified hosts or services, and of course, giving spammers
-a hard time. The talk will be in Norwegian, with <a
-href="http://www.bgnett.no/~peter/pf/no/foils/">foils</a> and <a
-href="http://www.bgnett.no/~peter/pf/no/">manuscript</a> (English <a
-href="http://www.bgnett.no/~peter/pf/en/foils/">foils</a> and <a
-href="http://www.bgnett.no/~peter/pf/en/">manuscript</a> too)
-available if you can't make it there.
-<p>
-
 <li><strong><a name=decix150405></a> <a
 href="http://www.de-cix.org/">DE-CIX Technical Meeting</a></strong>,
 April 15, 2005, Usingen, Germany.<br>
@@ -137,6 +122,21 @@
 
 <ul>
 
+<li><strong><a name=nuug140405></a>
+<a href="http://www.nuug.no/aktiviteter/20050414-pf-brannmur/">Firewalling with PF at NUUG</a></strong>,
+April 14, 2005, Oslo, Norway.<br>
+Peter N. M. Hansteen gave a firewalling with PF talk - which hopefully
+gave you some ideas about how to control your network traffic the
+way you want - keeping some things outside your network, directing
+traffic to specified hosts or services, and of course, giving spammers
+a hard time. The talk was in Norwegian, with <a
+href="http://www.bgnett.no/~peter/pf/no/foils/">foils</a> and <a
+href="http://www.bgnett.no/~peter/pf/no/">manuscript</a> (English <a
+href="http://www.bgnett.no/~peter/pf/en/foils/">foils</a> and <a
+href="http://www.bgnett.no/~peter/pf/en/">manuscript</a> too)
+available if you couldn't make it there.
+<p>
+
 <li><strong><a name=usenix2005></a>
 
 <a href="http://www.usenix.org/events/usenix05/">Usenix Annual
@@ -1468,7 +1468,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.351 2005/04/15 07:19:47 marius Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.352 2005/04/15 14:16:43 henning Exp $</small>
 
 </body>
 </html>