Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Mar 2009 21:08:41 +0000 (22:08 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Mar 2009 21:08:41 +0000 (22:08 +0100)
Conflicts:
navit/script/osm2navit_sea/osm2navit_sea.pl


Trivial merge