svn merge -r523:547 branches/config-step trunk

diff --cc configure.in
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/vserver.c
Simple merge

diff --cc src/wireless.c
index d41195e,03d124b..f0b9b01
--- 1/src/wireless.c
--- 2/src/wireless.c
+++ b/src/wireless.c
@@@ -39,9 -41,9 +39,9 @@@ static char *filename_template = "wirel
  
  static char *ds_def[] =
  {
-       "DS:quality:GAUGE:25:0:U",
-       "DS:power:GAUGE:25:U:0",
-       "DS:noise:GAUGE:25:U:0",
+       "DS:quality:GAUGE:"COLLECTD_HEARTBEAT":0:U",
 -      "DS:power:GAUGE:"COLLECTD_HEARTBEAT":0:U",
 -      "DS:noise:GAUGE:"COLLECTD_HEARTBEAT":0:U",
++      "DS:power:GAUGE:"COLLECTD_HEARTBEAT":U:0",
++      "DS:noise:GAUGE:"COLLECTD_HEARTBEAT":U:0",
        NULL
  };
  static int ds_num = 3;