SVN commit 9112 by makc: Mark conflicts M +2 -0 x11-themes/kde4-wallpapers-freebsd/Makefile M +1 -1 x11-themes/kdeartwork4/Makefile M +1 -1 x11/kactivitymanagerd/Makefile