Merge branch 'master' into next

Conflicts:
	mp3_afh.c

diff --combined error.h
index 81910e2d08f4cf8515c9fea2a87141da0e8eae4f,17f3703f41d20217540463f9fea64fa75b159cd2..ec1ec7b060e5d8180b4671dd96cec7ebb5359157
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -29,8 -29,6 +29,8 @@@ DEFINE_ERRLIST_OBJECT_ENUM
  #define HTTP_SEND_ERRORS
  #define GGO_ERRORS
  #define COLOR_ERRORS
 +#define SIGNAL_ERRORS
 +
  
  extern const char **para_errlist[];
  
@@@ -301,6 -299,10 +301,6 @@@
        PARA_ERROR(FILTER_SYNTAX, "syntax error"), \
  
  
 -#define SIGNAL_ERRORS \
 -      PARA_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
 -
 -
  #define STRING_ERRORS \
        PARA_ERROR(ATOI_OVERFLOW, "value too large"), \
        PARA_ERROR(STRTOLL, "unknown strtoll error"), \
@@@ -345,6 -347,7 +345,7 @@@
  
  #define VSS_ERRORS \
        PARA_ERROR(NOFD, "did not receive open fd from afs"), \
+       PARA_ERROR(BAD_CT, "invalid chunk table or bad FEC configuration")
  
  
  #define CRYPT_ERRORS \