Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)

committer Andre Noll <maan@systemlinux.org>

Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)
author Andre Noll <maan@systemlinux.org>
Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)
committer Andre Noll <maan@systemlinux.org>
Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)
diff --cc afs.c
Simple merge
diff --cc command.c
Simple merge
diff --cc server.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 26 Apr 2009 19:05:18 +0000 (21:05 +0200)
		1	2
afs.c	patch \|	diff1 \|	diff2 \|	blob \| history
command.c	patch \|	diff1 \|	diff2 \|	blob \| history
server.c	patch \|	diff1 \|	diff2 \|	blob \| history