2 Commits

Author	SHA1	Message	Date
jasper	b8ff9ddeb8	- add missing conflict with older gnome-media ... ok aja@	2011-09-12 08:02:51 +00:00
ajacoutot	6e0759aad5	Merge libgnome-media-profiles from gnome3.	2011-07-25 16:30:55 +00:00