===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.335
retrieving revision 1.336
diff -c -r1.335 -r1.336
*** www/events.html	2005/03/24 18:24:33	1.335
--- www/events.html	2005/03/25 00:31:35	1.336
***************
*** 92,98 ****
  A broad overview of PF's features will be presented, with special attention
  paid to newer and more unique features and how these can be used together
  effectively for DoS mitigation, high availability, and load balancing.
! <p>
  The other major PF developers will also be in attendance and available to answer
  questions: Bob Beck (Edmonton) who did spamd, Mike Frantzen (USA) who did the
  state engine, Daniel Hartmeier (Switzerland) who started it all, Markus Friedl
--- 92,98 ----
  A broad overview of PF's features will be presented, with special attention
  paid to newer and more unique features and how these can be used together
  effectively for DoS mitigation, high availability, and load balancing.
! <br>
  The other major PF developers will also be in attendance and available to answer
  questions: Bob Beck (Edmonton) who did spamd, Mike Frantzen (USA) who did the
  state engine, Daniel Hartmeier (Switzerland) who started it all, Markus Friedl
***************
*** 100,108 ****
  integrated PF with ALTQ bandwidth shaping and pushed us to fix some early load
  problems, and Theo de Raadt who deleted that non-free Australian junk and
  created the opportunity for this crazy bunch of people to get together.
! <p>
  There will be brand new OpenBSD 3.7 CDs and tshirts and posters for sale
  at this event.....
  </ul>
  
  <hr>
--- 100,117 ----
  integrated PF with ALTQ bandwidth shaping and pushed us to fix some early load
  problems, and Theo de Raadt who deleted that non-free Australian junk and
  created the opportunity for this crazy bunch of people to get together.
! <br>
  There will be brand new OpenBSD 3.7 CDs and tshirts and posters for sale
  at this event.....
+ <p>
+ 
+ <li><strong><a name=softlibre2005></a>
+ <a href="http://www.softlibre.org.ar">
+ Segundo Congreso Nacional de Software Libre - USUARIA 2005</a></strong>,
+ June 6-7, 2005, Buenos Aires, Argentina.<br>
+ Theo is (very likely) presenting a keynote about what things should be free.
+ <p>
+ 
  </ul>
  
  <hr>
***************
*** 1419,1425 ****
  <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.335 2005/03/24 18:24:33 reyk Exp $</small>
  
  </body>
  </html>
--- 1428,1434 ----
  <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.336 2005/03/25 00:31:35 deraadt Exp $</small>
  
  </body>
  </html>