K 10
svn:author
V 5
erwin
K 8
svn:date
V 27
2010-10-29T12:41:29.000000Z
K 7
svn:log
V 105
Fix a mismerge in the previous revision and revert the reversion
of revision 1.651.

Noticed by:	sunpoet

END