CVS commit by pinto: 

CVS_SILENT update.


  M +18 -3     95-imageviewers.xml   1.2


--- kckde/kdetraf-71/95-imageviewers.xml  #1.1:1.2
@@ -6,6 +6,6 @@
         contact="mailto:stampede@uai.com.br"
         posts="4"
-        startdate=""
-        enddate=""
+        startdate="Sun, 7 Dec 2003 21:09:16 +0100"
+        enddate="Mon, 8 Dec 2003 14:38:35 +0100"
 >
 <topic>Image Viewers</topic>
@@ -284,5 +284,5 @@
 <p>I would recommend anyone to test both Gwenview and ShowImg, you'll surely
 like both. While they are really similar, some features are exclusive of one
-or the other, and it is these little detais that will guide your choice.</p>
+or the other, and it is these little details that will guide your choice.</p>
 
 <p>From the interviews and the dot comments, it looks like there's real
@@ -302,3 +302,18 @@
 </editorialize>
 
+<p>
+Last minute update: Aurelien Gateau wants to add that he had a meeting with
+Richard on IRC where the possibility of a merge was discussed. According to
+Aurelien, the meeting <quote who="Aurelien Gateau">wasn't very productive [...]
+We can't agree on some technical choices like whether a viewer should implement
+everything or rely on external programs for some tasks. Another problem is that
+Richard can't work on ShowImg in a regular way so it will be difficult to work
+together.</quote> He has setup a Wiki page to discuss the possibility of a
+merge, which you can find at <a
+href="http://kde.ground.cz/tiki-index.php?page=ShowImg+Gwenview+merge">
+http://kde.ground.cz/tiki-index.php?page=ShowImg+Gwenview+merge</a>. He notes
+that he is the only one who expressed his opinion on that page so far, but it
+would be nice if users could comment on it.
+</p>
+
 </section>