Merged branch 'master' of git://git.tokkee.org/sysdb.

Conflicts:
	t/Makefile.am
	t/libsysdb_test.c
	t/libsysdb_test.h

diff --cc t/Makefile.am
index 7d249e4792f2c5ab8c9f9f5def9e08ec1552d3c3,1e4419dd7fcf053fae573e60278ce82520397ece..c31ac502de3f22757eb4d9a908934500be2219be
--- 1/t/Makefile.am
--- 2/t/Makefile.am
+++ b/t/Makefile.am
@@@ -6,7 -6,7 +6,8 @@@ check_PROGRAMS = libsysdb_test libsysdb
  
  libsysdb_test_SOURCES = \
                libsysdb_test.c libsysdb_test.h \
 +              core/object_test.c \
+               utils/channel_test.c \
                utils/dbi_test.c \
                utils/llist_test.c \
                utils/strbuf_test.c

diff --cc t/libsysdb_test.c
index 2693a8d478053d1487390474a443c6084150d5e8,7ce41247c679a8b9a2f636d5e9def467d8c1e311..91909b8448bd2ed7562af9a65055075b734b8e6f
--- 1/t/libsysdb_test.c
--- 2/t/libsysdb_test.c
+++ b/t/libsysdb_test.c
@@@ -37,9 -37,9 +37,10 @@@ main(void
        size_t i;
  
        suite_creator_t creators[] = {
-               { util_llist_suite, NULL },
 +              { core_object_suite, NULL },
+               { util_channel_suite, NULL },
                { util_dbi_suite, NULL },
+               { util_llist_suite, NULL },
                { util_strbuf_suite, NULL },
        };
  

diff --cc t/libsysdb_test.h
index 9d83dc6cab5afb8febac271144045c2c3fdee13f,da57246fe8f7e5fad93db503dea004b26fc5baf0..eadeca5d06716d4f29a5e466913ea36f292db0d7
--- 1/t/libsysdb_test.h
--- 2/t/libsysdb_test.h
+++ b/t/libsysdb_test.h
@@@ -59,10 -59,10 +59,14 @@@ typedef struct 
   * test suites
   */
  
 +/* t/core/object_test */
 +Suite *
 +core_object_suite(void);
 +
+ /* t/utils/channel_test */
+ Suite *
+ util_channel_suite(void);
+ 
  /* t/utils/dbi_test */
  Suite *
  util_dbi_suite(void);