K 10
svn:author
V 6
eadler
K 8
svn:date
V 27
2012-06-02T04:49:36.000000Z
K 7
svn:log
V 111
Add missing conflicts

Submitted by:	Sulev-Madis "ketas" Silber <madis555@hot.ee>
Approved by:	tj (maintainer)

END