Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Mon Mar 01 14:22:56 2010 +0100 Revision: 3590 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 3769. Modified: M .bzrignore M Makefile.am M configure.ac M doc/HOWTO.xml M hipd/hipd.c M hipd/maintenance.c M hipd/maintenance.h M hipd/netdev.c M lib/core/misc.c M lib/core/prefix.h M test/packaging/create-deb.sh Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)