===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.490
retrieving revision 1.491
diff -c -r1.490 -r1.491
*** www/events.html	2006/05/15 16:58:58	1.490
--- www/events.html	2006/05/23 13:07:40	1.491
***************
*** 42,55 ****
  
  <ul>
  
- <li><strong><a name="SANE2006"></a>
- <a href="http://www.sane.nl/sane2006/">SANE 2006</a></strong>,
- May 15 - 19, 2006, Delft, The Netherlands.<br>
- Peter N. M. Hansteen will give a
- <a href="http://www.sane.nl/sane2006/program/abstract.php?eventid=35">
- PF tutorial</a>.
- <p>
- 
  <li><strong><a name=LinuxwochenVienna2006></a>
  <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2006</a></strong>,
  May 31 - June 2, 2006, Vienna, Austria.<br>
--- 42,47 ----
***************
*** 57,69 ****
  Boothslaves volunteer at the normal address.
  <p>
  
- <li><strong><a name="lsm2006"></a>
- <a href="http://2006.rencontresmondiales.org/home/?lang=en_GB">Libre Software Meeting 2006</a></strong>,
- Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
- There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
- suspects, with the help of Serge Basterot and Alexandre Anriot.
- <p>
- 
  <li><strong><a name=FrOSCon></a>
  <a href="http://www.froscon.de/">
  FrOSCon 2006 - Free and Open Source Software Conference</a></strong>,
--- 49,54 ----
***************
*** 71,76 ****
--- 56,68 ----
  There will be an OpenBSD and OpenSSH booth run by Wim and the usual suspects.
  Boothslaves volunteer at the normal address.
  <p>
+ 
+ <li><strong><a name="lsm2006"></a>
+ <a href="http://2006.rencontresmondiales.org/home/?lang=en_GB">Libre Software Meeting 2006</a></strong>,
+ Jul 4 - 8, 2006, Vandoeuvre-les-nancy, France.<br>
+ There will be an OpenBSD and OpenSSH booth, run by Wim and the usual
+ suspects, with the help of Serge Basterot and Alexandre Anriot.
+ <p>
  </ul>
  
  <hr>
***************
*** 80,85 ****
--- 72,85 ----
  <h3>2006</h3>
  <ul>
  
+ <li><strong><a name="SANE2006"></a>
+ <a href="http://www.sane.nl/sane2006/">SANE 2006</a></strong>,
+ May 15 - 19, 2006, Delft, The Netherlands.<br>
+ Peter N. M. Hansteen gave a
+ <a href="http://www.sane.nl/sane2006/program/abstract.php?eventid=35">
+ PF tutorial</a>.
+ <p>
+ 
  <li><strong><a name=bsdcan2006></a> <a
  href="http://www.bsdcan.org/2006/">BSDCan 2006</a></strong>,
  May 12 - 13, 2006, Ottawa, Canada.<br>
***************
*** 1928,1934 ****
  <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.490 2006/05/15 16:58:58 reyk Exp $</small>
  
  </body>
  </html>
--- 1928,1934 ----
  <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.491 2006/05/23 13:07:40 bernd Exp $</small>
  
  </body>
  </html>