Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Tue, 1 Sep 2009 20:37:00 +0000 (22:37 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Tue, 1 Sep 2009 20:37:00 +0000 (22:37 +0200)
commitc76ddc6dd3caf2ff359181e8ba464a20e2dd39cb
tree80bef0efea0ef220f040fed22fec62a7b8291f69
parentf85f12df9b76ba98c345266772e5d6339bcada68
parent1233deb135e50d836e086f84acc15723d9b6675f
Merge commit 'origin/upstream-svn' into upstream

Conflicts:
navit/graphics/win32/graphics_win32.c
navit/graphics/win32/graphics_win32.h
navit/gui/win32/gui_win32.c
navit/script/osm/osmtool.pl
navit/support/glib/gstrfuncs.c
navit/support/wordexp/Makefile.am
navit/support/wordexp/wordexp.c