===================================================================
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 @@
 
 <ul>
 
-<li><strong><a name=bsdcan2006></a> <a
-href="http://www.bsdcan.org/2006/">BSDCan 2006</a></strong>,
-May 12 - 13, 2006, Ottawa, Canada.<br>
-David Gwynne will give a talk about hardware monitoring with bio and
-sensors in OpenBSD (<a href="papers/bsdcan06-biosensors.pdf">slides</a>)
-and Reyk Fl&ouml;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.
-<p>
-
 <li><strong><a name="SANE2006"></a>
 <a href="http://www.sane.nl/sane2006/">SANE 2006</a></strong>,
 May 15 - 19, 2006, Delft, The Netherlands.<br>
@@ -92,6 +80,18 @@
 <h3>2006</h3>
 <ul>
 
+<li><strong><a name=bsdcan2006></a> <a
+href="http://www.bsdcan.org/2006/">BSDCan 2006</a></strong>,
+May 12 - 13, 2006, Ottawa, Canada.<br>
+David Gwynne gave a talk about hardware monitoring with bio and
+sensors in OpenBSD (<a href="papers/bsdcan06-biosensors.pdf">slides</a>)
+and Reyk Fl&ouml;ter talked about the latest
+wireless support and the incredible plans for the future
+(<a href="papers/bsdcan06-wlan/index.html">slides</a>), and
+Peter Hansteen gave a PF tutorial. A number of OpenBSD hackers
+attended the conference as well, like Bob Beck and Mathieu Sauve-Frankel.
+<p>
+
 <li><strong><a name="linuxdays2006"></a>
 <a href="http://www.linuxdays.ch">Linuxdays 2006</a></strong>, 
 May 8 - 12, 2006, Geneva, Switzerland.<br>
@@ -1928,7 +1928,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.489 2006/05/15 09:44:59 bernd Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.490 2006/05/15 16:58:58 reyk Exp $</small>
 
 </body>
 </html>