2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 767208bf3..6b5c74b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060613
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2006/05/08 10:49:48
+     [sshconnect2.c]
+     uint32_t -> u_int32_t (which we use everywhere else)
+     (Id sync only - portable already had this)
+
 20060521
  - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
    and slave, we can remove the special-case handling in the audit hook in
@@ -4630,4 +4637,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.4330 2006/05/21 08:26:40 dtucker Exp $
+$Id: ChangeLog,v 1.4331 2006/06/13 02:59:53 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 6fdcf8a1c..53cf25762 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.152 2006/04/25 08:02:27 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.153 2006/05/08 10:49:48 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *