===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.548
retrieving revision 1.549
diff -c -r1.548 -r1.549
*** www/events.html	2006/10/18 22:07:32	1.548
--- www/events.html	2006/10/18 23:46:12	1.549
***************
*** 115,123 ****
   <li>Marc Balmer: <i>Time Signal Stations and GPS</i>
   <li>Felix Kronlage: <i>Redundancy or mobile deployment with 3G technology</i>
   <li>Jonathan Gray: <i>Driver architecture and implementation in OpenBSD</i>
-  <li>Marco Peereboom: <i>Bio and Sensors in OpenBSD</i>
   <li>Gordon Klok: <i>Processor Power Management</i>
!  <li>David Gwynne: <i>The OpenBSD Culture</i>
   <li>Can Erkin Acar: <i>Developing Secure Software</i>
   </ul>
  <p>
--- 115,122 ----
   <li>Marc Balmer: <i>Time Signal Stations and GPS</i>
   <li>Felix Kronlage: <i>Redundancy or mobile deployment with 3G technology</i>
   <li>Jonathan Gray: <i>Driver architecture and implementation in OpenBSD</i>
   <li>Gordon Klok: <i>Processor Power Management</i>
!  <li>David Gwynne: <i>The OpenBSD Culture</i> and he will also fill in for Marco's <i>Bio and Sensors in OpenBSD</i> talk.
   <li>Can Erkin Acar: <i>Developing Secure Software</i>
   </ul>
  <p>
***************
*** 2112,2118 ****
  <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.548 2006/10/18 22:07:32 deraadt Exp $</small>
  
  </body>
  </html>
--- 2111,2117 ----
  <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.549 2006/10/18 23:46:12 marco Exp $</small>
  
  </body>
  </html>