===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.348
retrieving revision 1.349
diff -c -r1.348 -r1.349
*** www/events.html	2005/04/13 20:58:50	1.348
--- www/events.html	2005/04/13 22:26:48	1.349
***************
*** 111,116 ****
--- 111,126 ----
  Theo is (very likely) presenting a keynote about what things should be free.
  <p>
  
+ <li><strong><a name=uofa-cc2005></a> <a
+ href="http://www.ualberta.ca/CC2005"> University of Alberta, Campus
+ Computing 2005</a></strong>, June 21, 2005, Edmonton, Canada<br> Ryan
+ McBride will speak about OpenBSD's packet filter, PF, with CARP and
+ failover examples. Local color and examples at the U of A shown by Bob
+ Beck. Bob Beck will speak about PF and Spamd, as well as several other
+ OpenBSD using and related talks at this event, which primarily focuses
+ on activities centered at the University of Alberta.
+ <p>
+ 
  </ul>
  
  <hr>
***************
*** 1453,1459 ****
  <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.348 2005/04/13 20:58:50 deraadt Exp $</small>
  
  </body>
  </html>
--- 1463,1469 ----
  <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.349 2005/04/13 22:26:48 beck Exp $</small>
  
  </body>
  </html>