K 10
svn:author
V 5
erwin
K 8
svn:date
V 27
2012-02-07T14:08:00.000000Z
K 7
svn:log
V 69
Fix mismerge in previous commit

PR:
Submitted by:	pointyhat, rakuco

END