Merge branch 't/client_memory_leak_fix'
authorAndre Noll <maan@systemlinux.org>
Sat, 30 Jul 2011 18:22:47 +0000 (20:22 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 30 Jul 2011 18:22:47 +0000 (20:22 +0200)

Trivial merge