Merge branch 'master' of git+ssh://tal.org/home/git/mapper

Conflicts:

	src/mapper.c
	src/utils.c

diff --cc src/Makefile.am
Simple merge

diff --cc src/cb.c
Simple merge

diff --cc src/mapper.c
index ca18db5787998fe0d6cb84404a51b9c434a41797,47fc90e0cc4e0a31a30c6f9fa05d77d4642b9e63..72f6c66871f933cc9db6c5dee82bc5f8926ad8de
--- 1/src/mapper.c
--- 2/src/mapper.c
+++ b/src/mapper.c
@@@ -59,7 -61,8 +61,9 @@@
  #include "bt.h"
  #include "ui-common.h"
  #include "db.h"
 +#include "osm-db.h"
+ #include "cb.h"
+ #include "speak.h"
  
  gfloat UNITS_CONVERT[] = {1.85200,1.15077945,1.f,};
  

diff --cc src/poi-gui.c
Simple merge

diff --cc src/track.c
Simple merge