Merge commit 'meins/master'

author Andre Noll <maan@systemlinux.org>

Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)

committer Andre Noll <maan@systemlinux.org>

Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
author Andre Noll <maan@systemlinux.org>
Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
committer Andre Noll <maan@systemlinux.org>
Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
diff --cc osl.c
Simple merge
diff --cc osl.h.in
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 10 Jan 2009 22:10:52 +0000 (23:10 +0100)
		1	2
osl.c	patch \|	diff1 \|	diff2 \|	blob \| history
osl.h.in	patch \|	diff1 \|	diff2 \|	blob \| history