Merge branch 'maint'

Conflicts:
	configure.ac

diff --cc configure.ac
index f47a56df0c96f71d68e19b3655aa017925536a83,f7b70c1cba512ebbf0caff7cd961a5837731d228..efde761f4f186459e05c1aec158319d4e2816068
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -732,11 -633,6 +732,10 @@@ don
  AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
        [char * array of all status items])
  
- 
 +AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
 +      [formats supported by para_server and para_afh])
 +
 +AC_SUBST(executables, add_para($executables))
  
  recv_objs="$recv_cmdline_objs $recv_errlist_objs"
  filter_objs="$filter_cmdline_objs $filter_errlist_objs"