Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: 16/03/2010 at 21:56:07 Revision: 1667 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: midauth Log: synchronized to trunk revision 3969 Modified: D hipd/hi3.c.doxyme M configure.ac M hipd/accessor.c M hipd/accessor.h M hipd/hadb.c M hipd/hi3.c M hipd/netdev.c M hipd/output.c M hipd/user.c M tools/hipl_autobuild Merge from following parent revisions and branches: - midauth (parent-id: henrik.ziegeldorf@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)