K 10
svn:author
V 3
kib
K 8
svn:date
V 27
2011-03-13T13:37:23.262794Z
K 7
svn:log
V 34
Fix mismerge.

Pointy hat to:	kib

END