Merge 'viking-0.9.7'

diff --cc ChangeLog
index b8d7c2f4b716e1bd7fd81558b246c20785b5483d,cefcf57eb50efaeedb4182a1410fe01c54a3d2da..710d96a02b1992ce5bb20b8fc2d1e0aaef6911fc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,39 +1,49 @@@
 +2008-12-20
 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
 +      * Remove Google's map tiles
 +
 +2008-12-17
 +Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
 +      * Remove old Google stuff
 +
++2008-10-12
+ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * Release 0.9.7
+ 
+ 2008-10-12
+ Rob Norris <robbieonsea@users.sourceforge.net>:
+       * Fix 2161310: Fix some more compiler warnings
+ 
+ 2008-10-12
+ Jon Burgess <jburgess777@users.sourceforge.net>
+       * Fix 2134452: Properties of some tracks show as NaN
+ 
+ 2008-10-11
+ Quy Tonthat <qtonthat@gmail.com>:
+       * Fix segfault in realtime tracking.
+       * Add new moving map method for realtime tracking.
+ 
+ 2008-09-30
+ Stanislav Brabec <sbrabec@users.sourceforge.net>:
+       * Rename icon: viking_icon.png -> viking.png
+       * Fix missing files in po/POTFILES.in
+       * src/viking.desktop.in: add GenericName and revise Categories
+       * viking.spec.in, src/icons/Makefile.am: Fix icon target dir
+ 
+ 2008-09-22
+ Quy Tonthat <qtonthat@gmail.com>:
+       * Change "Zoom To" short cut to avoid conflict with "Zoom Tool".
+ 
+ 2008-09-16
+ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * Update translations
+ 
+ 2008-09-07
+ Quy Tonthat <qtonthat@gmail.com>:
+       * fix parallel build (make -j8) on multi-processor machines. Based
+       on a patch from sbrabec. Thanks.
++>>>>>>> viking-0.9.7:ChangeLog
+ 
  2008-09-03
  Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
        * QA: cleanning old stuff

diff --cc configure.ac
Simple merge

diff --cc po/POTFILES.in
index 7b8738ec82521e2ef08af0bb34c5da770b1489d2,65db7b9b26646651150a2fec5e3c4fb49f4e23ff..0fa12e38b22cff0b538126e6e9be0b255da47289
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -4,7 -4,9 +4,8 @@@ src/clipboard.
  src/curl_download.c
  src/dialog.c
  src/expedia.c
+ src/globals.c
  src/google.c
 -src/googlemaps.c
  src/googlesearch.c
  src/datasource_gc.c
  src/datasource_google.c

diff --cc src/vikmapslayer.c
Simple merge

diff --cc src/vikwindow.c
Simple merge