Merge from HEAD:
       newlib/
       * libc/include/math.h: (exception): Add a comment
       telling fixincludes that we handle C vs. C++ issue.
diff --git a/ChangeLog.csl b/ChangeLog.csl
index a79cea4..31769a0 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-10-25  Vladimir Prus  <vladimir@codesourcery.com>
+	
+	Merge from HEAD:
+	newlib/         
+	* libc/include/math.h: (exception): Add a comment
+	telling fixincludes that we handle C vs. C++ issue.
+
 2006-10-23  Paul Brook  <paul@codesourcery.com>
 
 	libgloss/