Merge branch 'master' of git://www.geeqie.org/geeqie

diff --cc src/thumb_standard.c
index c008dca,43ab9fe..2998f39
--- 1/src/thumb_standard.c
--- 2/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@@ -30,14 -30,15 +30,16 @@@
  #include "filedata.h"
  #include "exif.h"
  #include "metadata.h"
 +#include "color-man.h"
  
  
- /*
+ /**
+  * @file
+  * 
   * This thumbnail caching implementation attempts to conform
   * to the Thumbnail Managing Standard proposed on freedesktop.org
-  * The standard is documented here:
-  *   http://triq.net/~jens/thumbnail-spec/index.html
+  * The standard is documented here: \n
+  *   http://triq.net/~jens/thumbnail-spec/index.html \n
   *  (why isn't it actually hosted on freedesktop.org?)
   *
   * This code attempts to conform to version 0.7.0 of the standard.