[eurephia/f14/master: 2/2] Merge remote branch 'origin/f14/master' into f14

[dsommers]

commit 93a1e9894c62593068dd1a1ba6d7bcda69f64888
Merge: 3840dc1 9bcf535
Author: David Sommerseth <dazo at users.sourceforge.net>
Date:   Fri Sep 3 16:47:36 2010 +0200

    Merge remote branch 'origin/f14/master' into f14

 eurephia.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc eurephia.spec
index 816c9ba,e060273..955bf77
--- a/eurephia.spec
+++ b/eurephia.spec
@@@ -146,9 -149,12 +146,15 @@@ rm -rf %{buildroot
  %{_mandir}/man7/eurephia_saltdecode.7.gz
  
  %changelog
 +* Sun Aug 29 2010 David Somerseth <dazo at users.sourceforge.net> - 1.0.1-1
 +- Rebased to eurephia v1.0.1
 +
+ * Fri Aug 20 2010 Adam Tkac <atkac redhat com> 1.0.0-10
+ - rebuild to ensure F14 has bigger NVR than F13
+ 
+ * Fri Jul 16 2010 David Sommerseth <davids at redhat.com> - 1.0.0-9
+ - Bumped Release to 9 to get around F-14 cvs tag complaints
+ 
  * Thu Jul 15 2010 David Sommerseth <davids at redhat.com> - 1.0.0-8
  - Fixed silly mistakes
    - Forgot to move over /usr/lib/eurephia from eurephia to eurephia-sqlite3