2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 54fa577b3..74dfec38f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,11 @@
      avoid confusing wording in HashKnownHosts:
      originally spotted by alan amesbury;
      ok deraadt
+   - jmc@cvs.openbsd.org 2006/07/27 08:00:50
+     [ssh_config.5]
+     avoid confusing wording in HashKnownHosts:
+     originally spotted by alan amesbury;
+     ok deraadt
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5100,4 +5105,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4447 2006/08/05 01:34:51 djm Exp $
+$Id: ChangeLog,v 1.4448 2006/08/05 01:35:23 djm Exp $
diff --git a/atomicio.h b/atomicio.h
index 03bf065e2..05b97ab8b 100644
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.h,v 1.8 2006/04/16 00:52:55 djm Exp $ */
+/* $OpenBSD: atomicio.h,v 1.9 2006/07/30 20:15:19 stevesk Exp $ */
 
 /*
  * Copyright (c) 2006 Damien Miller.  All rights reserved.
@@ -30,9 +30,10 @@
 #define _ATOMICIO_H
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <sys/uio.h>
 
+#include <unistd.h>
+
 /*
  * Ensure all of data on socket comes through. f==read || f==vwrite
  */