Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 4 Sep 2009 08:38:34 +0000 (10:38 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 4 Sep 2009 08:38:34 +0000 (10:38 +0200)
1  2 
fade.c

diff --cc fade.c
Simple merge