jasper b0d87f22e5 restore @conflict markers, noticed by bernd@.		2007-02-07 20:05:02 +00:00
..
DESCR	Update to 2.6.5 to support the newer GTK+	2005-11-13 06:24:32 +00:00
PLIST	restore @conflict markers, noticed by bernd@.	2007-02-07 20:05:02 +00:00