Merge branch 'upstream' of pini-deb-guest@alioth.debian.org:/git/collab-maint/navit...
authorGilles Filippini <gilles.filippini@free.fr>
Sat, 21 Feb 2009 23:55:35 +0000 (00:55 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Sat, 21 Feb 2009 23:55:35 +0000 (00:55 +0100)

Trivial merge