Merge patch 6516 from the trunk. Original message was:

.------------------------------------------------------------------------
r6516 | sander | 2011-10-19 12:22:12 +0200 (Mi, 19. Okt 2011) | 1 Zeile

fixes for clang.  Patch by Elias Pipping (FS 944)


[[Imported from SVN: r6532]]