Merge branch 'sh/hddtemp'

diff --cc src/collectd.conf.in
index a1172a188b0205906510320a9265c9df9a346e0a,2554d60a6f75a4ce4eba5e6bd012c056e6571b4e..e125bb63173ee7585e71902feee3dacfa79cc071
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -102,13 -100,13 +102,14 @@@ FQDNLookup   tru
  
  #<Plugin exec>
  #     Exec "user:group" "/path/to/exec"
 +#     NotificationExec "/path/to/exec"
  #</Plugin>
  
- #<Plugin hddtemp>
+ @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
  #     Host "127.0.0.1"
  #     Port "7634"
- #</Plugin>
+ @BUILD_PLUGIN_HDDTEMP_TRUE@   TranslateDevicename false
+ @BUILD_PLUGIN_HDDTEMP_TRUE@</Plugin>
  
  #<Plugin interface>
  #     Interface "eth0"

diff --cc src/collectd.conf.pod
Simple merge