Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)

committer Andre Noll <maan@systemlinux.org>

Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)
author Andre Noll <maan@systemlinux.org>
Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)
committer Andre Noll <maan@systemlinux.org>
Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)
diff --cc NEWS
Simple merge
diff --cc fade.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 25 Jul 2009 13:52:09 +0000 (15:52 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
fade.c	patch \|	diff1 \|	diff2 \|	blob \| history