Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Nov 2009 13:17:35 +0000 (14:17 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Nov 2009 13:17:35 +0000 (14:17 +0100)
commitc29ca97e5db644e87b4ae6c61bb65aa7ae93e909
treed5d45c91a458f7edc5b488d759c7328be421770f
parent345ae2a6417121b8fdc2846700d7e4fb170abd01
parent90897c4958f785f0e1503231b10c5445b62438cd
Merge commit 'origin/upstream-svn' into upstream

Conflicts:
navit/android.c
navit/android/src/org/navitproject/navit/NavitGraphics.java
navit/graphics/win32/graphics_win32.c
navit/support/Makefile.am
navit/support/espeak/Makefile.am