Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/doc/CHANGES,v
rcsdiff: /ftp/cvs/cvsroot/src/doc/CHANGES,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1670.2.11
retrieving revision 1.1670.2.11.2.1
diff -u -p -r1.1670.2.11 -r1.1670.2.11.2.1
--- src/doc/CHANGES	2012/10/05 18:37:24	1.1670.2.11
+++ src/doc/CHANGES	2012/10/20 22:18:43	1.1670.2.11.2.1
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1670.2.11 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1670.2.11.2.1 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1286,5 +1286,5 @@ Changes from NetBSD 5.0 to NetBSD 6.0:
 	wm(4): Add support for Intel I350 Ethernet. [msaitoh 20120525]
 	postfix(1): Import version 2.8.11 [tron 20120609]
 	evbarm: Add initial support for the RaspberryPi. [skrll 20120726]
-	OpenSSH: Imported 1.0.1c [christos 20120726]
+	OpenSSL: Imported 1.0.1c [christos 20120726]
 	postfix(1): Import version 2.8.12 [tron 20120810]