===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- www/events.html	2005/06/07 13:00:50	1.370
+++ www/events.html	2005/06/07 16:43:37	1.371
@@ -26,20 +26,6 @@
 
 <ul>
 
-<li><strong><a name=uemera2005></a>
-<a href="http://www.tokyopc.net">Tokyo PC Users Group</a></strong>,
-Tokyo Union Church in Omotesando at 19:00-21:00, June 2, 2005, Tokyo, Japan.<br>
-Mark T. Uemura will be speaking to Japan's largest English speaking
-personal computer club.  The talk is entitled "Open Source in a
-Windows World".  He will demonstrate how companies can easily
-integrate Open Source, with an emphasis on OpenBSD, into their IT
-infrastructure to enhance security, scalability and stability,
-significantly reduce IT expenditures, free up computing infrastructure
-and move away from commercial lock-in.  This talk is based on changes
-implemented at PricewaterhouseCoopers in Japan.  Slides will be
-available after the presentation.
-<p>
-
 <li><strong><a name=recon2005></a>
 <a href="http://www.recon.cx/">REcon 2005</a></strong>,
 June 17 - 19, 2005, Montreal, Canada.<br>
@@ -120,6 +106,21 @@
 
 <ul>
 
+<li><strong><a name=uemera2005></a>
+<a href="http://www.tokyopc.net">Tokyo PC Users Group</a></strong>,
+Tokyo Union Church in Omotesando at 19:00-21:00, June 2, 2005, Tokyo, Japan.<br>
+Mark T. Uemura spoke to Japan's largest English speaking
+personal computer club.  The talk was entitled
+<a href="http://www.openbsd-support.com/jp/en/htm/mgp/index.shtml">
+"Open Source in a Windows World"</a>.
+He demonstrated how companies can easily
+integrate Open Source, with an emphasis on OpenBSD, into their IT
+infrastructure to enhance security, scalability and stability,
+significantly reduce IT expenditures, free up computing infrastructure
+and move away from commercial lock-in.  This talk is based on changes
+implemented at PricewaterhouseCoopers in Japan.
+<p>
+
 <li><strong><a name=LinuxwochenVienna2005></a>
 <a href="http://www.linuxwochen.at/">Linuxwochen Vienna 2005</a></strong>,
 May 24 - 27, 2005, Vienna, Austria.<br>
@@ -1532,7 +1533,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.370 2005/06/07 13:00:50 camield Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.371 2005/06/07 16:43:37 deraadt Exp $</small>
 
 </body>
 </html>