Merge branch 'master' into cde-next

Need to resync before folding current cde-next into master.

cde/lib/DtSvc/DtUtil1/Dt.h

@@ -51,14 +51,14 @@ extern "C" {
 /* CDE Version information */
 
 #define DtVERSION     		2
-#define DtREVISION    		2
-#define DtUPDATE_LEVEL    	4
+#define DtREVISION    		3
+#define DtUPDATE_LEVEL    	0
 
 #define DtVERSION_NUMBER	(DtVERSION * 10000 +  \
 				DtREVISION * 100 + \
 				DtUPDATE_LEVEL)
 
-#define DtVERSION_STRING "CDE Version 2.2.4a"
+#define DtVERSION_STRING "CDE Version 2.3.0"
 
 
 /* 

cde/lib/tt/bin/ttauth/ttauth.man

@@ -18,7 +18,7 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH TTAUTH 1 "Release 2.2.4a" "CDE"
+.TH TTAUTH 1 "Release 2.3.0" "CDE"
 .SH NAME
 ttauth \- ToolTalk authority file utility
 .SH SYNOPSIS

cde/lib/tt/tooltalk.tmpl

@@ -6,7 +6,7 @@
 /* TT_VERSION defines the version string which is imbedded in all the */
 /* binaries and shipped libraries. */
 
-TT_VERSION = "CDE Version 2.2.4a"
+TT_VERSION = "CDE Version 2.3.0"
 TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"