Merge branch 'sound'

Conflicts:
	tests/Makefile.am

diff --cc tests/Makefile.am
index 5a55db20e75c0a57e615c2a82b56cfaf9cd92381,0fdb5425d8b7daeb06ed27ad857e5357461da4a9..d00d91149de4035983209657221920497096bb1f
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -30,7 -30,7 +30,7 @@@ test_close_CFLAGS = @TEST_CFLAGS@ $(AM_
  test_close_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
  
  noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la \
-       styletest.la test-userstyle.la
 -      styletest.la soundtest.la
++      styletest.la soundtest.la test-userstyle.la
  
  first_la_SOURCES = first.c
  first_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
@@@ -50,5 -50,5 +50,9 @@@ multiwin_la_LDFLAGS = $(TEST_PLUGIN_LIB
  styletest_la_SOURCES = styletest.c
  styletest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
  
 +test_userstyle_la_SOURCES = test-userstyle.c
 +test_userstyle_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
++
+ soundtest_la_SOURCES = soundtest.c
+ soundtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
++

diff --cc tests/plugin-loader.c
Simple merge