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)
commit8970261c6574f5a46941308ac68a17dc01bbd11f
tree06656def0009f04c4d23b94d18eee472711e0bc2
parent702d72b58b6378c4cdb37cbb709fd1d351571123
parent7d455216838951cd8c1a89b2fc4167b37e94d59b
Merge branch 'master' into next

Conflicts:
aft.c
command.c
mp3dec_filter.c
vss.c