K 10
svn:author
V 3
flo
K 8
svn:date
V 27
2013-11-01T23:16:27.121148Z
K 7
svn:log
V 125
The previous commit fixed one mismerge and introduced another. Put a needed
check for i386 on 9.x back in.

Pointhat to:	flo

END