Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
1  2 
osl.c
osl.h.in

diff --cc osl.c
Simple merge
diff --cc osl.h.in
Simple merge