merge stable changes

diff --cc log.c
index b8c4c07823853ade32401f96ab5579027e253ef2,290f7e8ddb4c6c25cb9a5b965809d486759593b8..34cc4b5e4f41c729b41884f919d94dcb5f9ce120
--- 1/log.c
--- 2/log.c
+++ b/log.c
@@@ -31,14 -31,8 +31,8 @@@
  #define LMOD_SUP 32
  #define LMOD_CFG_VALID  0x80000000
  
- struct LogHeader {
-   int c;
-   char stamp[32];
-   char tag[64];
-   };
- 
  struct LogConfig logcfg = {
 -  1,0,0,
 +  1,0,0,0,
    0,
    "/var/log/vdr-sc"
    };

diff --cc log.h
Simple merge

diff --cc po/it_IT.po
index 1b75611ed5ec61154c294efd34bc365f2c7394c1,4eb76f8290b7ddd62e5039fd3c9e6373211b6aac..d0ca6ebe555286f368b52c581980bd75553559fe
--- 1/po/it_IT.po
--- 2/po/it_IT.po
+++ b/po/it_IT.po
@@@ -14,11 -14,8 +14,11 @@@ msgstr "
  "Content-Type: text/plain; charset=ISO-8859-15\n"
  "Content-Transfer-Encoding: 8bit\n"
  
 +msgid "Key update"
 +msgstr ""
 +
  msgid "off"
- msgstr "spento"
+ msgstr "disattivo"
  
  msgid "SoftCAM"
  msgstr "SoftCAM"

diff --cc systems/nagra/nagra2.c
Simple merge