diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index 1771d8a5..df7e188e 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  6 16:12:10 MDT 2006 - schoi@novell.com
+
+- Merge CASA.changes with one in autobuild  
+
 -------------------------------------------------------------------
 Fri Sep 29 12:30:07 MDT 2006 - jnorman@novell.com
 
@@ -17,12 +22,12 @@ Wed Sep 27 15:10:47 MDT 2006 - jnorman@novell.com
 -------------------------------------------------------------------
 Wed Sep 27 11:57:09 MDT 2006 - jnorman@novell.com
 
-- Move the .miCASA files to /home/.casa/username dir 
+- Move the .miCASA files to ~/.casa
 
 -------------------------------------------------------------------
 Wed Sep 27 11:56:07 MDT 2006 - jnorman@novell.com
 
-- Move the .CASAPolicy files to /home/.casa/username 
+- Move the .CASAPolicy files to ~/.casa
 
 --------------------------------------------------------------------
 Thu Jul 06 14:32:53 MDT 2006 - jnorman@novell.com
@@ -66,20 +71,20 @@ Mon Jun 05 15:30:53 MDT 2006 - jnorman@novell.com
   during an upgrade.
 
 --------------------------------------------------------------------
-Thursday May 25 16:15:53 MDT 2006 - jnorman@novell.com
+Thu May 25 16:15:53 MDT 2006 - jnorman@novell.com
 - Bug 178796: change the way we generate the new salt so that 
   we are cross-plat.
 
 --------------------------------------------------------------------
-Thursday May 25 09:21:53 MDT 2006 - cmashayekhi@novell.com
+Thu May 25 09:21:53 MDT 2006 - cmashayekhi@novell.com
 - casa-gnome-keyring.h was cleaned up.
 
 ------------------------------------------------------------------
-Tuesday May 23 14:15:21 MDT 2006 - cmashayekhi@novell.com
+Tue May 23 14:15:21 MDT 2006 - cmashayekhi@novell.com
 - Eliminated the gnome-kering.h header file.
 
 -------------------------------------------------------------------
-Monday May 22 14:01:31 MDT 2006 - cmashayekhi@novell.com
+Mon May 22 14:01:31 MDT 2006 - cmashayekhi@novell.com
 - Fixed dependency cycle between CASA <-> gnome-keyring.
 - Bug 176736.  Fixed micasad startup/shutdown process to clean up 
   open files on shutdown and upgrade.