===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- www/events.html	2006/12/04 11:12:49	1.577
+++ www/events.html	2006/12/04 13:00:47	1.578
@@ -47,7 +47,7 @@
 Berlin</a></strong>,
 December 27 - 30, 2006, Berlin, Germany.<br>
 Who can you trust? Well, us. OpenBSD will be there, of course, for our annual
-closing event.  fkr, grunk, jsg, mbalmer, mickey, reyk, sturm, uwe, and
+closing event.  fkr, grunk, jsg, mbalmer, mickey, reyk, sturm, uwe, martin and
 wvdputte will be
 there to chat with you and discuss OpenBSD stuff.  More OpenBSD developers will
 likely step in.
@@ -75,7 +75,7 @@
  <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>David Gwynne: <i>The OpenBSD Culture</i> and he also filled 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>
@@ -2121,7 +2121,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.577 2006/12/04 11:12:49 mbalmer Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.578 2006/12/04 13:00:47 martin Exp $</small>
 
 </body>
 </html>