===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.833
retrieving revision 1.834
diff -c -r1.833 -r1.834
*** www/events.html	2010/05/30 13:31:08	1.833
--- www/events.html	2010/07/06 23:16:54	1.834
***************
*** 40,49 ****
--- 40,61 ----
  
  <h3>2010</h3>
  <ul>
+ 
+ <li><strong><a name="OSCON2010"></a>
+ <a href="http://www.oscon.com/">OSCON 2010</a></strong>,
+ Jul 19 - 23, 2010, Portland, Oregon, USA.<br>
+ OpenBSD CD's and accessories will be available at Booth 802 in the exhibitor
+ area on Wednesday and Thursday (July 21st & 22nd) of the week long event.<br>
+ Developer Jacob Meuser, audio specialist, will be there to talk tech. with passers by,
+ and any other OpenBSD developers in the area are encouraged to join in.<br>
+ Seth Fulton, Austin Hook and others will assist. 
+ <p>
+ 
  <li><strong><a name="eurobsdcon2010"></a>
  <a href="http://2010.eurobsdcon.org/">EuroBSDCon 2010</a></strong>,
  Oct 8 - 10, 2010, Karlsruhe, Germany.<br>
  <p>
+ 
  </ul>
  
  <p>
***************
*** 2889,2895 ****
  <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.833 2010/05/30 13:31:08 jasper Exp $</small>
  
  </body>
  </html>
--- 2901,2907 ----
  <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.834 2010/07/06 23:16:54 austin Exp $</small>
  
  </body>
  </html>