Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: Fri Feb 12 17:10:41 2010 +0100 Revision: 3587 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: packaging Log: Synchronized to trunk revision 3622 Modified: M agent/agent.c M firewall/helpers.c M hipd/hiprelay.c M hipd/hiprelay.h M lib/core/hip_capability.c M lib/core/misc.h Merge from following parent revisions and branches: - packaging (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)