--- a/ChangeLog	Wed Mar 30 08:20:17 2011 +0000
+++ b/ChangeLog	Mon Apr 04 07:06:05 2011 +0000
@@ -1,3 +1,8 @@
+2011-04-04  Padraig O'Briain  <[email protected]>
+
+        * patches/avahi-16-socket.diff: Remove patch
+        * base-specs/avahi.spec: Bump to 0.6.29
+
 2011-03-30  Li Yuan <[email protected]>
 
 	* base-specs/gok.spec:
@@ -186,6 +191,7 @@
 	  patches/python-ctypes-02-util-find-library.diff: Remove patches no
 	  longer needed.
 
+>>>>>>> .r23506
 2011-03-08  Brian Cameron  <[email protected]>
 
 	* base-specs/liboil.spec: