Merge branch 'exempi-2.0-branch'

Conflicts:

	ChangeLog
	NEWS
	configure.ac

1 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b7a7ad2..e011740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,6 @@
 
 	* exempi/exempi.cpp (xmp_files_get_xmp): CHECK_PTR should 
 	return false and not NULL.
-	
 
 2008-04-06  Hubert Figuiere  <hub@figuiere.net>
 
@@ -18,6 +17,18 @@
 
 	* Start 2.1.0
 
+=== 2.0.2 ===
+
+2008-08-12  Hubert Figuiere  <hub@figuiere.net>
+
+	* exempi/exempi.cpp (set_error): Use pthread for the TLS 
+	if there is no compiler support.
+	(Closes #16598)
+
+	* configure.ac:
+	* m4/ax_tls.m4:
+	Check for TLS.
+
 === 2.0.1 ===
 
 2008-04-28  Hubert Figuiere  <hub@figuiere.net>