Committer: Miika Komu <miika@xxxxxx> Date: Thu Feb 18 15:36:05 2010 +0200 Revision: 490 [merge] Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: update Log: Synchronized to trunk revision 3681 Modified: D hipd/pisa.h.doxyme M firewall/esp_prot_api.c M test/auth_performance.c Merge from following parent revisions and branches: - update (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)