===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.482
retrieving revision 1.483
diff -c -r1.482 -r1.483
*** www/events.html	2006/04/30 00:12:02	1.482
--- www/events.html	2006/04/30 13:34:03	1.483
***************
*** 54,59 ****
--- 54,66 ----
  First event in Brazil totally dedicated to OpenBSD.
  <p>
  
+ <li><strong><a name="linuxdays2006"></a>
+ <a href="http://www.linuxdays.ch">Linuxdays 2006</a></strong>, 
+ May 8 - 12, 2006, Geneva, Switzerland.<br>
+ There will be an OpenBSD and OpenSSH booth run by Wim and Marc Balmer on the Wednesday and Thursday.<br>
+ A talk will be given by Julien Mabillard, a long-time Geneva OpenBSD user, to present the overall system and its great features.
+ <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>
***************
*** 1884,1890 ****
  <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.482 2006/04/30 00:12:02 pedro Exp $</small>
  
  </body>
  </html>
--- 1891,1897 ----
  <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.483 2006/04/30 13:34:03 wvdputte Exp $</small>
  
  </body>
  </html>