Merge branch 'stg-2.409' into stg-2.409-radius

diff --cc projects/rlm_stg/Makefile
Simple merge

diff --cc projects/rlm_stg/build
Simple merge

diff --cc stglibs/common.lib/Makefile
index 33f29440463ef847f362e1fa703980d43ea2e9ba,1f662c25c3357985ec83d49a11fbb5129b7a4539..932e270948b62d3b78fed5186e6889e53dd304b2
--- 1/stglibs/common.lib/Makefile
--- 2/stglibs/common.lib/Makefile
+++ b/stglibs/common.lib/Makefile
@@@ -7,14 -7,10 +7,12 @@@ include ../../Makefile.con
  LIB_NAME = stgcommon
  
  SRCS = common.cpp \
 -      strptime.cpp
 +       strptime.cpp \
 +       blockio.cpp
  
 -INCS = common.h
 +INCS = common.h \
 +       blockio.h
  
- ifneq ($(OS),linux)
- LIBS += -liconv
- endif
+ LIBS += $(LIBICONV)
  
  include ../Makefile.in