updated. and remove of trailing spaces.

 2003-02-23  Alain Magloire
 
+	* mailbox/refcount.c: Added a simple thread-safe implementation.
+	* include/mailutils/types.h: Added structure for refcount.
+	* include/mailutils/refcount.h: Added a simple thread-safe implementation.
+
+2003-02-23  Alain Magloire
+
 	* include/mailutils/types.h: Added the mailcap structure.
 	* include/mailutils/mailcap.h: Include types.h
 
@@ -58,7 +64,6 @@
 	* mh/mh.h (mhdraft_stream_create): New function.
 	* mh/mh_init.c (mh_stream_to_message): Use MH draft streams.
 
->>>>>>> 1.685
 2003-02-20  Sergey Poznyakoff
 
 	* mh/README: Updated