Common subdirectories: dnsmasq-orig/bld and dnsmasq-2.33/bld
Common subdirectories: dnsmasq-orig/contrib and dnsmasq-2.33/contrib
Common subdirectories: dnsmasq-orig/dbus and dnsmasq-2.33/dbus
diff -u dnsmasq-orig/dnsmasq.conf.example dnsmasq-2.33/dnsmasq.conf.example
--- dnsmasq-orig/dnsmasq.conf.example	2006-10-15 08:12:26.000000000 -0700
+++ dnsmasq-2.33/dnsmasq.conf.example	2006-10-15 08:19:08.000000000 -0700
@@ -58,7 +58,9 @@
 #address=/doubleclick.net/127.0.0.1
 
 # If you want dnsmasq to change uid and gid to something other
-# than the default, edit the following lines.
+# than the default, edit the following lines. This requires the 
+# capability kernel module to take effect. 
+# 
 #user=
 #group=
 
Common subdirectories: dnsmasq-orig/man and dnsmasq-2.33/man
Common subdirectories: dnsmasq-orig/po and dnsmasq-2.33/po
Common subdirectories: dnsmasq-orig/src and dnsmasq-2.33/src