[jana: 2/2] fix merge

[Peter Robinson]

commit a0b43d7397b013dcdd284f567129c8b93fa56d3c
Merge: 25cac31 47c1f0f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Nov 22 13:41:41 2011 +0000

    fix merge

 jana.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc jana.spec
index 0fa0298,d234b55..62d4b52
--- a/jana.spec
+++ b/jana.spec
@@@ -9,7 -9,7 +9,7 @@@
  
  Name:          jana
  Version:       0.4.5
- Release:       0.18.%{snapshot}%{?dist}
 -Release:       0.20.%{snapshot}%{?dist}
++Release:       0.21.%{snapshot}%{?dist}
  Summary:       An interface library for time-related PIM
  
  Group:         System Environment/Libraries
@@@ -82,10 -82,16 +82,19 @@@ rm -rf %{buildroot}/%{_libdir}/*.l
  %{_datadir}/gtk-doc/html/libjana
  
  %changelog
- * Tue Nov 22 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.4.5-0.18.20100520gitacd72f2
++* Tue Nov 22 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.4.5-0.21.20100520gitacd72f2
 +- EDS rebuild
 +
+ * Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.4.5-0.20.20100520gitacd72f2
+ - Rebuild against newer evolution-data-server
+ 
+ * Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 0.4.5-0.19.20100520gitacd72f2
+ - Sync version with Fedora 16 package
+ 
+ * Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 0.4.5-0.18.20100520gitacd72f2
+ - Rebuild against newer evolution-data-server
+ 
 -* Sun Jul 24 2011 Peter Robinson <pbrobinson at gmail.com> - 0.4.5-0.17.20100520gitacd72f2
 +* Sun Jul 24 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.4.5-0.17.20100520gitacd72f2
  - EDS rebuild
  
  * Mon Jun 20 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.4.5-0.16.20100520gitacd72f2