Merge commit 'viking-0.9.9' into gobjectify-map-type

diff --cc configure.ac
Simple merge

diff --cc po/POTFILES.in
index 1dd0975c1b1b95063d568fa9d084a9c5381d9bdf,dacfb31b36ccfc31b6c9cde7955040ab6761cae1..b38a78536fad7e40aa751a71b23e86945f480c02
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -14,7 -14,7 +14,8 @@@ src/datasource_gps.
  src/dem.c
  src/download.c
  src/file.c
 +src/osm-traces.c
+ src/mapcache.c
  src/print.c
  src/util.c
  src/vikcoordlayer.c

diff --cc src/Makefile.am
Simple merge

diff --cc src/vikmapslayer.c
Simple merge