Merge commit '980ef11016546ecd409a7f83b33a2f8f758ec926' into thread-next

diff --cc lib/Makefile
index 6ed778cc5fa24db78d47ecb2f11734adfe32e7e2,5a90e6b46916a66211aa114ff8d65c532eb9612a..0762b606e86a70be86f4c65915635d09bf04f122
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -2,6 -2,6 +2,6 @@@ src := a-path.c a-set.c bitmap.c bitops
  obj := $(src-o-files)
  $(all-daemon)
  
- tests_src := a-set_test.c a-path_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c tlists_test.c type_test.c
 -tests_src := attribute_cleanup_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c
++tests_src := a-set_test.c a-path_test.c attribute_cleanup_test.c bitmap_test.c heap_test.c buffer_test.c event_test.c flowspec_test.c bitops_test.c patmatch_test.c fletcher16_test.c slist_test.c checksum_test.c lists_test.c mac_test.c ip_test.c hash_test.c printf_test.c slab_test.c tlists_test.c type_test.c
  tests_targets := $(tests_targets) $(tests-target-files)
  tests_objs := $(tests_objs) $(src-o-files)

diff --cc lib/birdlib.h
Simple merge