Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Thu, 3 Sep 2009 16:49:31 +0000 (18:49 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 3 Sep 2009 16:49:31 +0000 (18:49 +0200)
1  2 
fade.c

diff --cc fade.c
Simple merge