Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:43:03 +0000 (22:43 +0100)
1  2 
oss_write.c
write_common.c

diff --cc oss_write.c
Simple merge
diff --cc write_common.c
Simple merge