Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:14:11 +0000 (11:14 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:14:11 +0000 (11:14 +0100)
commit4f84874080ab5c73267b06ea9131aaab940c9e3c
tree808e5809120b0346241eb7251889dc0f4f61f9e6
parent131b8f9e3dd00b3b438414424e4121db36588fba
parent75a3f40e7c67637882e599ee545fc2d967b54a37
Merge branch 'upstream-svn' into upstream

Conflicts:
navit/support/libc/errno.h