Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)

committer Andre Noll <maan@systemlinux.org>

Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)
author Andre Noll <maan@systemlinux.org>
Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)
committer Andre Noll <maan@systemlinux.org>
Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)
diff --cc fd.c
Simple merge
diff --cc vss.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Mon, 14 Sep 2009 08:09:38 +0000 (10:09 +0200)
		1	2
fd.c	patch \|	diff1 \|	diff2 \|	blob \| history
vss.c	patch \|	diff1 \|	diff2 \|	blob \| history