Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Tue Feb 02 08:39:08 2010 +0100 Revision: 3511 [merge] Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 3522. Modified: M hipd/hadb.c M hipd/heartbeat.c M hipd/hidb.c M hipd/hipd.c M hipd/netdev.c M hipd/nsupdate.c M hipd/oppdb.c M hipd/user.c Merge from following parent revisions and branches: - tiny (parent-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)