===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- www/events.html	2007/03/10 08:05:05	1.626
+++ www/events.html	2007/03/11 12:02:10	1.627
@@ -43,16 +43,6 @@
 <ul>
 <p>
 
-<li><strong><a name="asiabsdcon2007"></a>
-<a href="http://www.asiabsdcon.org/">AsiaBSDCon 2007</a></strong>,
-Mar 8 - 11, 2007, Tokyo, Japan.<br>
-Marc Balmer will give a talk <a href="papers/asiabsdcon07-radioclocks/index.html">Supporting Radio Clocks in OpenBSD</a>.<br>
-Ryan McBride will give talks on "OpenBSD as a Development Platform" and "OpenBSD Network Randomness Injection: Further Improvements".<br>
-Mathieu Sauve-Frankel will give a talk "Recent Improvements in OpenBSD's IPSec Support".<br>
-Damien Miller will present a paper on "Security measures in OpenSSH".<br>
-There will be two PF tutorials back to back, Peter Hansteen's "Firewalling with OpenBSD's PF packet filter" and Ryan McBride's "Advanced PF Rulesets".
-<p>
-
 <li><strong><a name="elite2007"></a>
 <a href="http://www.erlug.de/?q=node/323">5. Erlanger Linuxtage</a></strong>,
 Mar 24 - 25, 2007, Erlangen, Germany.<br>
@@ -145,6 +135,16 @@
 
 <h3>2007</h3>
 <ul>
+<li><strong><a name="asiabsdcon2007"></a>
+<a href="http://www.asiabsdcon.org/">AsiaBSDCon 2007</a></strong>,
+Mar 8 - 11, 2007, Tokyo, Japan.<br>
+Marc Balmer gave a talk <a href="papers/asiabsdcon07-radioclocks/index.html">Supporting Radio Clocks in OpenBSD</a>.<br>
+Ryan McBride gave talks on <a href="papers/asiabsdcon07-development/index.html">OpenBSD as a Development Platform</a> and <a href="papers/asiabsdcon07-network_randomness/index.html">OpenBSD Network Randomness Injection: Further Improvements</a>.<br>
+Mathieu Sauve-Frankel gave a talk "Recent Improvements in OpenBSD's IPSec Support".<br>
+Damien Miller presented a paper on "Security measures in OpenSSH".<br>
+There were also PF tutorials back to back, Peter Hansteen's "Firewalling with OpenBSD's PF packet filter" and Ryan McBride's "Advanced PF Rulesets".
+<p>
+
 <li><strong><a name="linuxforum2007"></a>
 <a href="http://www.linuxforum.dk/2007/">LinuxForum 2007</a></strong>,
 Mar 2 - 3, 2007, Copenhagen, Denmark.<br>
@@ -2277,7 +2277,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.626 2007/03/10 08:05:05 mbalmer Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.627 2007/03/11 12:02:10 mcbride Exp $</small>
 
 </body>
 </html>