===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.477
retrieving revision 1.478
diff -c -r1.477 -r1.478
*** www/events.html	2006/04/19 06:47:48	1.477
--- www/events.html	2006/04/26 21:12:07	1.478
***************
*** 37,51 ****
  only).
  <p>
  
- <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>
- 
  <li><strong><a name=tokyo2006></a>
  <a href="http://www.tokyopc.org/index.php/weblog/">Tokyo PC Users Group</a></strong>,
  May 2, 2006, Tokyo.<br>
--- 37,42 ----
***************
*** 120,125 ****
--- 111,127 ----
  <h3>2006</h3>
  <ul>
  
+ <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 gave a talk "Providing Fully Automated Fileserver Services
+ for Public Schools using LDAP Integrated SAMBA on OpenBSD" that was very
+ well received.
+ <br>
+ There was an OpenBSD and OpenSSH booth run by Wim and Marc and Felix Kronlage
+ and we could draw a lot of attention.
+ <p>
+ 
  <li><strong><a name=linuxworld2006></a>
  <a href="http://www.linuxworldexpo.com/live/12/events/12BOS06A/">
  LinuxWorld/OpenSolutions World 2006</a></strong>,
***************
*** 1875,1881 ****
  <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.477 2006/04/19 06:47:48 martin Exp $</small>
  
  </body>
  </html>
--- 1877,1883 ----
  <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.478 2006/04/26 21:12:07 mbalmer Exp $</small>
  
  </body>
  </html>