===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.466
retrieving revision 1.467
diff -c -r1.466 -r1.467
*** www/events.html	2006/03/24 10:40:53	1.466
--- www/events.html	2006/03/24 10:46:15	1.467
***************
*** 63,68 ****
--- 63,72 ----
  <a href="http://www.linuxtag.org/2006/">LinuxTag 2006</a></strong>,
  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.
  <p>
***************
*** 1838,1844 ****
  <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.466 2006/03/24 10:40:53 claudio Exp $</small>
  
  </body>
  </html>
--- 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>