[neon/f13/master: 4/4] - update to 0.29.4 (#575429)

[jorton]

commit f7d29baf89f5803616cd17b8d48ad5b03ce2c0b7
Merge: 1c7a5fb bbc3906
Author: Joe Orton <jorton at redhat.com>
Date:   Fri Oct 1 17:01:01 2010 +0100

    - update to 0.29.4 (#575429)

 neon.spec |    5 ++++-
 sources   |    4 ++++
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc neon.spec
index 8815f1a,53a7c9e..2bdb2c0
--- a/neon.spec
+++ b/neon.spec
@@@ -76,8 -76,11 +76,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/*.so
  
  %changelog
+ * Fri Oct  1 2010 Joe Orton <jorton at redhat.com> - 0.29.4-1
 -- update to 0.29.4
++- update to 0.29.4 (#575429)
+ 
  * Thu Mar 25 2010 Joe Orton <jorton at redhat.com> - 0.29.3-1
 -- update to 0.29.3
 +- update to 0.29.3 (#577346)
  
  * Fri Jan  8 2010 Joe Orton <jorton at redhat.com> - 0.29.2-1
  - update to 0.29.2
diff --cc sources
index c8f04c9,58acbd6..0c63867
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ba1015b59c112d44d7797b62fe7bee51  neon-0.29.3.tar.gz
++=======
+ 29438dbdaee84db2d7fbc73248a92d93  neon-0.29.4.tar.gz
++>>>>>>> origin/master