Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 2 Apr 2008 20:12:11 +0000 (22:12 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 2 Apr 2008 20:12:11 +0000 (22:12 +0200)
1  2 
grab_client.c

diff --cc grab_client.c
Simple merge