diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index e42161a04b..e4fd843c4d 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,20 @@
+2008-07-08  Sancho Lerena <slerena@gmail.com>
+
+	* linux/plugins/grep_log: Changed default type to "async_string"
+
+2008-07-07  Evi Vanoost  <vanooste@rcbi.rochester.edu>
+
+	* pandora_agents/tools
+	pandora_agents/linux/plugins
+	pandora_agents/mac_osx/plugins: Moved tools into the plugin sections of 
+	compatible agents. The plugins in subdirectories have dependencies that 
+	can be found in the README file while plugins directly in the directory
+	can be used directly when Pandora agent prerequisites are met (Perl & Bash)
+
+        * pandora_agents/mac_osx/pandora_user.conf
+        pandora_agents/mac_osx/plugins/ppc_sensors: Moved pandora_user.conf 
+	into the new plugins section
+
 2008-06-30  Sancho Lerena <slerena@artica.es>
 
 	*  pandora_agents/win32/installer/pandora_2.0.mpi: New installer for 2.0
diff --git a/pandora_agents/linux/plugins/grep_log b/pandora_agents/linux/plugins/grep_log
index 01a73d40c2..67fb215a20 100755
--- a/pandora_agents/linux/plugins/grep_log
+++ b/pandora_agents/linux/plugins/grep_log
@@ -173,7 +173,7 @@ sub parse_log () {
 
 	print (stdout "<module>\n");
 	print (stdout "<name><![CDATA[" . $Module_name . "]]></name>\n");
-	print (stdout "<type><![CDATA[generic_data_string]]></type>\n");
+	print (stdout "<type><![CDATA[async_string]]></type>\n");
 	print (stdout "<datalist>\n");
 
 	# Parse log file