K 10 svn:author V 6 marcus K 8 svn:date V 27 2009-02-27T07:16:36.000000Z K 7 svn:log V 28 Add a conflict on libproxy. END