Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: Mon Mar 01 13:17:31 2010 +0100 Revision: 3765 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: synchronized to branches/packaging revision 3598 Modified: M .bzrignore M configure.ac M hipd/netdev.c M lib/core/misc.c M lib/core/prefix.h M libinet6/ifaddrs.c M libinet6/ifnames.c Merge from following parent revisions and branches: - trunk (parent-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - packaging (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)