Merge 4.3p2 to the trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/version.h b/version.h
index c4397326f..35eb49d63 100644
--- a/version.h
+++ b/version.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: version.h,v 1.45 2005/08/31 09:28:42 markus Exp $ */
+/* $OpenBSD: version.h,v 1.46 2006/02/01 11:27:22 markus Exp $ */
 
-#define SSH_VERSION     "OpenSSH_4.2"
+#define SSH_VERSION     "OpenSSH_4.3"
 
-#define SSH_PORTABLE    "p1"
+#define SSH_PORTABLE    "p2"
 #ifndef SSH_EXTRAVERSION
 #define SSH_EXTRAVERSION
 #endif