===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.573
retrieving revision 1.574
diff -c -r1.573 -r1.574
*** www/events.html	2006/11/20 11:31:28	1.573
--- www/events.html	2006/11/28 13:09:46	1.574
***************
*** 57,67 ****
   <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>
   <li>Michele Marchetto: <i>OpenRIPD</i>
   </ul>
  <p>
! Also present will be jcs, krw, mglocker, robert, wvdputte, martin, reyk, grunk,
  dhartmei, aanriot, sturm, and bernd.  Of course there will be an OpenBSD booth
  run by the usual suspects and you can buy our CD-ROMS, the audio CD and other
  stuff.
--- 57,67 ----
   <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>Michele Marchetto: <i>OpenRIPD</i>
+  <li>Reyk Floeter: <i>IPsec demystified</i>
   </ul>
  <p>
! Also present will be jcs, krw, mglocker, robert, wvdputte, martin, grunk,
  dhartmei, aanriot, sturm, and bernd.  Of course there will be an OpenBSD booth
  run by the usual suspects and you can buy our CD-ROMS, the audio CD and other
  stuff.
***************
*** 2114,2120 ****
  <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.573 2006/11/20 11:31:28 grunk Exp $</small>
  
  </body>
  </html>
--- 2114,2120 ----
  <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.574 2006/11/28 13:09:46 mbalmer Exp $</small>
  
  </body>
  </html>