Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 9 Jan 2009 00:16:44 +0000 (01:16 +0100)
1  2 
fd.c
string.c

diff --cc fd.c
Simple merge
diff --cc string.c
Simple merge