Merge branch-2-1

author Frank Lahm <franklahm@googlemail.com>

Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)

committer Frank Lahm <franklahm@googlemail.com>

Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)
author Frank Lahm <franklahm@googlemail.com>
Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)
committer Frank Lahm <franklahm@googlemail.com>
Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)
diff --cc NEWS
Simple merge
diff --cc etc/afpd/status.c
Simple merge
author	Frank Lahm <franklahm@googlemail.com>
	Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)
committer	Frank Lahm <franklahm@googlemail.com>
	Wed, 12 Jan 2011 15:42:53 +0000 (16:42 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
etc/afpd/status.c	patch \|	diff1 \|	diff2 \|	blob \| history