===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.461
retrieving revision 1.462
diff -c -r1.461 -r1.462
*** www/events.html	2006/03/08 20:15:41	1.461
--- www/events.html	2006/03/10 17:01:03	1.462
***************
*** 53,61 ****
  May 12 - 13, 2006, Ottawa, Canada.<br>
  David Gwynne will give a talk about hardware monitoring with bio and
  sensors in OpenBSD and Reyk Fl&ouml;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.
  <p>
  
  <li><strong><a name="SANE2006"></a>
--- 53,62 ----
  May 12 - 13, 2006, Ottawa, Canada.<br>
  David Gwynne will give a talk about hardware monitoring with bio and
  sensors in OpenBSD 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>
***************
*** 1818,1824 ****
  <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.461 2006/03/08 20:15:41 reyk Exp $</small>
  
  </body>
  </html>
--- 1819,1825 ----
  <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.462 2006/03/10 17:01:03 reyk Exp $</small>
  
  </body>
  </html>