Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Wed Feb 10 20:14:28 2010 +0100 Revision: 3525 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized with trunk at revision 3583. Modified: D firewall/conntrack.c.doxyme D firewall/dlist.c.doxyme D firewall/firewall.c.doxyme D firewall/firewall_control.c.doxyme D firewall/firewalldb.c.doxyme M .bzrignore M configure.ac M doc/doxygen.h M firewall/cache.c M firewall/cache.h M firewall/cache_port.c M firewall/cache_port.h M firewall/conntrack.c M firewall/dlist.c M firewall/esp_prot_api.c M firewall/esp_prot_config.c M firewall/esp_prot_conntrack.c M firewall/esp_prot_fw_msg.c M firewall/firewall.c M firewall/firewall.h M firewall/firewall_control.c M firewall/firewall_control.h M firewall/firewalldb.c M firewall/firewalldb.h M firewall/lsi.c M firewall/lsi.h M firewall/pisa_cert.c M firewall/sysopp.c M hipd/cert.h M lib/conf/hipconf.h M lib/core/certtools.c M lib/tool/lutil.c M lib/tool/nlink.c M lib/tool/nlink.h Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)