Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 09:35:41 +0000 (11:35 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 09:35:41 +0000 (11:35 +0200)
Conflicts:
client_common.c

1  2 
NEWS

diff --cc NEWS
Simple merge