Merge remote branch 'origin/upstream-svn' into upstream
authorGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:07 +0000 (22:36 +0100)
committerGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:07 +0000 (22:36 +0100)
commitb9466f3619daa22367e64aaebb271c79905a23c5
treef3b54e63f7039c54814af6ff97bd0ac1923d63bd
parent7349deb97accedb7e61d919924697a11c56677d0
parente0023b3a4bbe36bfbb146fa019c88bb8e51fdd8d
Merge remote branch 'origin/upstream-svn' into upstream

Conflicts:
navit/android/src/org/navitproject/navit/NavitGraphics.java