K 10 svn:author V 6 marcus K 8 svn:date V 27 2004-01-30T03:29:15.000000Z K 7 svn:log V 110 Add CONFLICTS from py-gtk2 and py-gtk to each other. Reported by: Tom McLaughlin END