[polkit/f14/master: 2/2] Resolve merge conflicts

[David Zeuthen]

commit e2b79c7938431f46227f62767ee8b240713bc871
Merge: ac846bf 325e959
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Sep 2 11:11:53 2010 -0400

    Resolve merge conflicts

 polkit.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --cc polkit.spec
index 7527c10,3c1e860..e134b2b
--- a/polkit.spec
+++ b/polkit.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: PolicyKit Authorization Framework
  Name: polkit
  Version: 0.98
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: LGPLv2+
  URL: http://www.freedesktop.org/wiki/Software/PolicyKit
  Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@@ -192,9 -180,9 +190,12 @@@ EO
  %{_datadir}/gtk-doc/html/*
  
  %changelog
- * Thu Sep 02 2010 David Zeuthen <davidz at redhat.com> - 0.98-2
++* Thu Sep 02 2010 David Zeuthen <davidz at redhat.com> - 0.98-3
 +- Include polkitagentenumtypes.h (#629515)
 +
+ * Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 0.98-2
+ - Co-own /usr/share/gtk-doc (#604410)
+ 
  * Fri Aug 20 2010 David Zeuthen <davidz at redhat.com> - 0.98-1
  - Update to upstream release 0.98