===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -r1.548 -r1.549
--- www/events.html 2006/10/18 22:07:32 1.548
+++ www/events.html 2006/10/18 23:46:12 1.549
@@ -115,9 +115,8 @@
Marc Balmer: Time Signal Stations and GPS
Felix Kronlage: Redundancy or mobile deployment with 3G technology
Jonathan Gray: Driver architecture and implementation in OpenBSD
- Marco Peereboom: Bio and Sensors in OpenBSD
Gordon Klok: Processor Power Management
- David Gwynne: The OpenBSD Culture
+ David Gwynne: The OpenBSD Culture and he will also fill in for Marco's Bio and Sensors in OpenBSD talk.
Can Erkin Acar: Developing Secure Software
@@ -2112,7 +2111,7 @@
www@openbsd.org
-
$OpenBSD: events.html,v 1.548 2006/10/18 22:07:32 deraadt Exp $
+
$OpenBSD: events.html,v 1.549 2006/10/18 23:46:12 marco Exp $