Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 02:10:39 +0000 (03:10 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 02:10:39 +0000 (03:10 +0100)
commitb0c11d1b3de36cc50dcb9aa043b1188ad14af99d
treea68654f37ff3d1924f4ffefc25c416dec78dd2d6
parentb9466f3619daa22367e64aaebb271c79905a23c5
parentefbfe5b8ea5aaec1ae08c922a996f844d8e16f14
Merge branch 'upstream-svn' into upstream

Conflicts:
navit/graphics/win32/Makefile.am
navit/support/libc/Makefile.am