===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.467
retrieving revision 1.468
diff -c -r1.467 -r1.468
*** www/events.html	2006/03/24 10:46:15	1.467
--- www/events.html	2006/03/24 10:57:40	1.468
***************
*** 54,60 ****
  <li><strong><a name=SambaEXPerience2006></a>
  <a href="http://www.sambaxp.org/">Samba eXPerience 2006</a></strong>,
  April 24 - 26, 2006, G&ouml;ttingen, Germany.<br>
! Marc Balmer will give a talk about Providing Fully Automated Fileserver Services for Public Schools using LDAP Integrated SAMBA on OpenBSD.
  <br>
  There will be an OpenBSD and OpenSSH booth run by Wim and Marc.
  <p>
--- 54,61 ----
  <li><strong><a name=SambaEXPerience2006></a>
  <a href="http://www.sambaxp.org/">Samba eXPerience 2006</a></strong>,
  April 24 - 26, 2006, G&ouml;ttingen, Germany.<br>
! Marc Balmer will give a talk "Providing Fully Automated Fileserver Services
! for Public Schools using LDAP Integrated SAMBA on OpenBSD".
  <br>
  There will be an OpenBSD and OpenSSH booth run by Wim and Marc.
  <p>
***************
*** 64,71 ****
  May 3 - 6, 2006, Wiesbaden, Germany.<br>
  Claudio Jeker will give a talk about Routing with OpenBSD using OpenOSPFD and OpenBGPD.
  <br>
! Marc Balmer will give a talk about Decoding Time Signal Stations using OpenBSD and a
! second talk about OpenBSD as a Strategic Platform for the Basel Public Schools.
  <br>
  There will be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
  Boothslaves volunteer at the normal address.
--- 65,72 ----
  May 3 - 6, 2006, Wiesbaden, Germany.<br>
  Claudio Jeker will give a talk about Routing with OpenBSD using OpenOSPFD and OpenBGPD.
  <br>
! Marc Balmer will give a talk "Decoding Time Signal Stations using OpenBSD" and a
! second talk "OpenBSD as a Strategic Platform for the Basel Public Schools".
  <br>
  There will be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
  Boothslaves volunteer at the normal address.
***************
*** 1842,1848 ****
  <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.467 2006/03/24 10:46:15 mbalmer Exp $</small>
  
  </body>
  </html>
--- 1843,1849 ----
  <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.468 2006/03/24 10:57:40 mbalmer Exp $</small>
  
  </body>
  </html>