===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -r1.849 -r1.850
--- www/events.html	2011/06/15 16:28:48	1.849
+++ www/events.html	2011/08/20 02:11:01	1.850
@@ -41,12 +41,6 @@
 <h3>2011</h3>
 <ul>
 
-<li><strong><a name="slackathon2011"></a>
-<a href="http://www.slackathon.se:2011/">Slackathon 2011</a></strong>,
-August 6, 2011, Stockholm, Sweden.<br>
-OpenBSD conference and fundraiser.
-<p>
-
 <li><strong><a name="eurobsdcon2011"></a>
 <a href="http://2011.eurobsdcon.org/">EuroBSDCon 2011</a></strong>,
 October 6 - 9, 2011, Maarssen (near Utrecht) in The Netherlands.<br>
@@ -61,6 +55,20 @@
 <h3>2011</h3>
 <ul>
 
+<li><strong><a name="slackathon2011"></a>
+<a href="http://www.slackathon.se:2011/">Slackathon 2011</a></strong>,
+August 6, 2011, Stockholm, Sweden.<br>
+Jonathan Gray gave an
+<a href="slackathon2011_update/index.html">OpenBSD Update</a>.<br>
+Ariane van der Steldt gave talks about 
+<a href="slackathon2011_vmmap/index.html">vmmap</a>
+and <a href="slackathon2011_64bitandjit/index.html">64 bit and jit</a>.<br>
+Paul Irofti gave a talk about
+<a href="slack2k11-on_compat_linux.pdf">the Compatibility Layer in OpenBSD 5.0</a>.<br>
+Henning Brauer gave a talk titled  
+<a href="http://bulabula.org/papers/2011/pf10yrs/">10 years of PF</a>.<br>
+<p>
+
 <li><strong><a name="bsdcan2011"></a>
 <a href="http://www.bsdcan.org/2011/">BSDCan 2011</a></strong>,
 May 11 - 14, 2011, Ottawa, Canada.<br>
@@ -2960,7 +2968,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.849 2011/06/15 16:28:48 jsg Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.850 2011/08/20 02:11:01 deraadt Exp $</small>
 
 </body>
 </html>