===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- www/events.html	2010/03/17 08:18:53	1.820
+++ www/events.html	2010/03/17 08:41:47	1.821
@@ -41,7 +41,13 @@
 <h3>2010</h3>
 <ul>
 
--
+<li><strong><a name="bsdcan2010"></a>
+<a href="http://www.bsdcan.org/2010/">BSDCan 2010</a></strong>,
+May 11 - 14, 2010, Ottawa, Canada.<br>
+Peter N. M. Hansteen will give a tutorial on building networks with PF.<br>
+Henning Brauer and Sven Dehmlow will give a talk about Puffy At Work -- Getting Code Right And Secure.<br>
+Jean-Philippe Dionne will give a talk about ECDYSIS OPEN-SOURCE NAT64 Implementation in OpenBSD PF.
+<p>
 
 </ul>
 
@@ -2861,7 +2867,7 @@
 <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.820 2010/03/17 08:18:53 marco Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.821 2010/03/17 08:41:47 claudio Exp $</small>
 
 </body>
 </html>