K 10
svn:author
V 3
mva
K 8
svn:date
V 27
2009-07-07T20:06:31.000000Z
K 7
svn:log
V 64
Fixed CONFLICTS for timidity++ 2.13

Approved by:	miwi (mentor)

END