Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 31 Aug 2009 19:37:03 +0000 (21:37 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 31 Aug 2009 19:37:03 +0000 (21:37 +0200)
Conflicts:
aft.c
command.c

1  2 
mp3dec_filter.c
vss.c

diff --cc mp3dec_filter.c
Simple merge
diff --cc vss.c
Simple merge