K 10
svn:author
V 5
adamw
K 8
svn:date
V 27
2012-06-05T02:21:20.000000Z
K 7
svn:log
V 137
Fix typo to properly register conflict with mtools.

Submitted by:	ketas (madis555 at hot dot ee)

I'm looking at you here, skreuzer ;-)

END