K 10
svn:author
V 4
rene
K 8
svn:date
V 27
2014-04-23T11:06:57.940125Z
K 7
svn:log
V 78
Restore conflict with -nox11 variant

Submitted by:	John Hein in PR follow up

END