===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.623
retrieving revision 1.624
diff -c -r1.623 -r1.624
*** www/events.html	2007/03/06 22:03:42	1.623
--- www/events.html	2007/03/06 22:29:24	1.624
***************
*** 43,49 ****
  <ul>
  <p>
  
! <li><strong><a name="asiabsdcon2007"</a>
  <a href="http://www.asiabsdcon.org/">AsiaBSDCon 2007</a></strong>,
  Mar 8 - 11, 2007, Tokyo, Japan.<br>
  Marc Balmer will give a talk "Support for GPS- and Time Signal Station Receivers
--- 43,49 ----
  <ul>
  <p>
  
! <li><strong><a name="asiabsdcon2007"></a>
  <a href="http://www.asiabsdcon.org/">AsiaBSDCon 2007</a></strong>,
  Mar 8 - 11, 2007, Tokyo, Japan.<br>
  Marc Balmer will give a talk "Support for GPS- and Time Signal Station Receivers
***************
*** 54,59 ****
--- 54,68 ----
  There will be two PF tutorials back to back, Peter Hansteen's "Firewalling with OpenBSD's PF packet filter" and Ryan McBride's "Advanced PF Rulesets".
  <p>
  
+ <li><strong><a name="elite2007"></a>
+ <a href="http://www.erlug.de/?q=node/323">5. Erlanger Linuxtage</a></strong>,
+ Mar 24 - 25, 2007, Erlangen, Germany.<br>
+ There will be an OpenBSD/OpenSSH booth, run by Alexander von Gernler (grunk@).
+ Volunteers for helping there are welcome!<br>
+ Alexander will also give a general introduction talk to OpenBSD for
+ the rather Linux-related audience.
+ <p>
+ 
  <li><strong><a name="fisl8"></a>
  <a href="http://fisl.softwarelivre.org/8.0/www/?q=en">fisl8.0</a></strong>,
  Apr 12-14, 2007, Porto Alegre, RS, Brazil.<br>
***************
*** 2260,2266 ****
  <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.623 2007/03/06 22:03:42 wvdputte Exp $</small>
  
  </body>
  </html>
--- 2269,2275 ----
  <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.624 2007/03/06 22:29:24 grunk Exp $</small>
  
  </body>
  </html>