a few cleanup patches

[David Disseldorp]

On Fri, 25 Oct 2013 12:18:57 +0200
Volker Lendecke <Volker.Lendecke at SerNet.DE> wrote:

> > Please add your SOB line. A short description in the changelog (like
> > above) would be nice too.  
> 
> Attached.

Thanks Volker, pushed to autobuild.

Cheers, David