Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 1 Apr 2008 17:01:40 +0000 (19:01 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 1 Apr 2008 17:01:40 +0000 (19:01 +0200)
1  2 
afs.c

diff --cc afs.c
Simple merge