Merge remote-tracking branch 'origin/f16'

Conflicts:
	shared-mime-info.spec

defaults.list

@@ -1,8 +1,8 @@
 [Default Applications]
 application/x-dia-diagram=fedora-dia.desktop
-#text/x-vcard=evolution.desktop
-#text/x-vcalendar=evolution.desktop
-#text/calendar=evolution.desktop
+text/x-vcard=evolution.desktop
+text/directory=evolution.desktop
+text/calendar=evolution.desktop
 application/x-cd-image=mount-archive.desktop
 image/x-compressed-xcf=gimp.desktop
 image/x-xcf=gimp.desktop

shared-mime-info.spec

@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Thu Oct 13 2011 Bastien Nocera <bnocera@redhat.com> 0.91-4
+- Make Evolution the default calendar (and not Gedit...)
+
 * Thu Oct 13 2011 Bastien Nocera <bnocera@redhat.com> 0.91-3
 - Make shotwell the default for camera roll handling
 - Make shotwell-viewer the default image viewer (for the
@@ -87,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 - Prefer Rhythmbox to Totem for music files
 
 * Sun Sep 18 2011 Bastien Nocera <bnocera@redhat.com> 0.91-2
+- Fix changelog entries
+
+* Sun Sep 18 2011 Bastien Nocera <bnocera@redhat.com> 0.91-1
 - Update to 0.91
 
 * Thu Aug 25 2011 Bastien Nocera <bnocera@redhat.com> 0.90-9