[speech-dispatcher/f14/master: 2/2] fix merge conflict

[Peter Robinson]

commit e12b227d02ebdbedf522dde64f7d03a3f1bebc89
Merge: 4b3e198 caa3594
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 14 16:04:16 2010 +0100

    fix merge conflict

 speech-dispatcher.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc speech-dispatcher.spec
index 964e004,ded3fea..ce2f4ab
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@@ -200,9 -198,9 +200,12 @@@ f
  %{python_sitearch}/speechd*
  
  %changelog
 +* Thu Oct 14 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7.1-2
 +- Depend on festival-freebsoft-utils so we work with festival
 +
+ * Tue Oct 05 2010 jkeating - 0.7.1-1.1
+ - Rebuilt for gcc bug 634757
+ 
  * Tue Sep 14 2010 Peter Robinson <pbrobinson at gmail.com> - 0.7.1-1
  - New upstream 0.7.1 stable release
  - Some spec and build cleanups