r25912: Two patches

r25912: Two patches

Hi!

Can you check and push them?

Thanks,

Volker

From b488af5905e2dee12a1a72a3b40801ae5c26f24f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Sat, 27 Oct 2007 14:20:09 +0200
Subject: [PATCH] Fix some warnings and errors

merge from v3-2-test commit e17d3e10e860c96b6d5208e5fe51e43b8e58c174
(This used to be commit 4087731e1b4e97017c0f5659e6659e8181d8e038)