jasper 54f991a6e6 - adjust conflict marker to gnome-themes-* ... with and ok aja@		2011-05-13 12:52:58 +00:00
..
pkg	- adjust conflict marker to gnome-themes-*	2011-05-13 12:52:58 +00:00
distinfo
Makefile	- adjust conflict marker to gnome-themes-*	2011-05-13 12:52:58 +00:00