Merge branch 'maint'

author Andre Noll <maan@systemlinux.org>

Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)

committer Andre Noll <maan@systemlinux.org>

Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
author Andre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
committer Andre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
diff --cc oss_write.c
Simple merge
diff --cc write_common.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
		1	2
oss_write.c	patch \|	diff1 \|	diff2 \|	blob \| history
write_common.c	patch \|	diff1 \|	diff2 \|	blob \| history