Index: trunk/src/route-rnd/netseg.c
===================================================================
--- trunk/src/route-rnd/netseg.c	(revision 1468)
+++ trunk/src/route-rnd/netseg.c	(revision 1469)
@@ -37,8 +37,11 @@
 
 static int netseg_found_cb(rtrnd_find_t *ctx, rtrnd_any_obj_t *new_obj, rtrnd_any_obj_t *arrived_from)
 {
-	assert(new_obj->hdr.netseg == NULL); /* or maybe merge network segments? */
-/*	printf(" found: %s %p\n", new_obj->hdr.oid, ctx->user_data);*/
+	if (new_obj->hdr.netseg != NULL) {
+		/* two net segs merge; switch this one over */
+		rtrnd_netseg_merge(ctx->user_data, new_obj->hdr.netseg);
+		return 0;
+	}
 	rtrnd_netseg_reg_obj(ctx->user_data, new_obj);
 	return 0;
 }