K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2011-01-04T11:56:56.000000Z
K 7
svn:log
V 146
Remove conflicted files with rtmpdump and a CONFLICTS line.  The
flvstreamer can coexist with rtmpdump now.

Pointed out by:	Jan Henrik Sylvester

END