Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Sep 2009 10:11:12 +0000 (12:11 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Sep 2009 10:11:12 +0000 (12:11 +0200)
commitef81b9f4f0fa6a26043c68d429c0deeb7c949351
treedbac637ea5bd989a3b3467c420b8bb874a08d0ec
parentf7b2683c0181e0eb4262cc782830b858b4c5fcfc
parentca9b940c1bcad4c89940e735ee17c062809ecf88
Merge branch 'master' into next

Conflicts:
ogg_afh.c
NEWS
error.h
fecdec_filter.c
ogg_afh.c
oggdec_filter.c
stdin.c
vss.c