Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: 11/05/2010 at 12:26:57 Revision: 3778 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 4478. Modified: D test/packaging/armel/ D test/packaging/armel/DEBIAN/ D test/packaging/armel/DEBIAN-FW/ D test/packaging/armel/DEBIAN-FW/changelog D test/packaging/armel/DEBIAN-FW/control D test/packaging/armel/DEBIAN-FW/control-src D test/packaging/armel/DEBIAN-FW/copyright D test/packaging/armel/DEBIAN-FW/postinst D test/packaging/armel/DEBIAN-FW/postrm D test/packaging/armel/DEBIAN-FW/preinst D test/packaging/armel/DEBIAN-FW/prerm D test/packaging/armel/DEBIAN-FW/rules D test/packaging/armel/DEBIAN-dnsproxy/ D test/packaging/armel/DEBIAN-dnsproxy/changelog D test/packaging/armel/DEBIAN-dnsproxy/control D test/packaging/armel/DEBIAN-dnsproxy/control-src D test/packaging/armel/DEBIAN-dnsproxy/copyright D test/packaging/armel/DEBIAN-dnsproxy/postinst D test/packaging/armel/DEBIAN-dnsproxy/postrm D test/packaging/armel/DEBIAN-dnsproxy/preinst D test/packaging/armel/DEBIAN-dnsproxy/prerm D test/packaging/armel/DEBIAN-dnsproxy/rules D test/packaging/armel/DEBIAN-gconf/ D test/packaging/armel/DEBIAN-gconf/changelog D test/packaging/armel/DEBIAN-gconf/control D test/packaging/armel/DEBIAN-gconf/copyright D test/packaging/armel/DEBIAN-gconf/postinst D test/packaging/armel/DEBIAN-gconf/postrm D test/packaging/armel/DEBIAN/changelog D test/packaging/armel/DEBIAN/control D test/packaging/armel/DEBIAN/control-src D test/packaging/armel/DEBIAN/copyright D test/packaging/armel/DEBIAN/postinst D test/packaging/armel/DEBIAN/postrm D test/packaging/armel/DEBIAN/preinst D test/packaging/armel/DEBIAN/prerm D test/packaging/armel/DEBIAN/rules D test/packaging/create-deb.sh R test/maintainer/ => tools/maintainer/ R test/packaging/ => packaging/ M Makefile.am M debian/rules M doc/HACKING M doc/HOWTO.xml M firewall/esp_prot_fw_msg.h M firewall/pisa.c M lib/core/hostid.h M packaging/create-package.sh M packaging/hipl-deb.spec M packaging/hipl-rpm.spec M patches/opendht/how-to-steps M test/auth_eval.sh M tools/maintainer/sync-all Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)