Merge branch 'collectd-5.5'

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

diff --cc src/collectd.conf.pod
index b992eac,7a66c81..5d9e737
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -2540,17 -2513,23 +2540,34 @@@ do that: By setting B<IgnoreSelected> t
  B<Interface> is inverted: All selected interfaces are ignored and all
  other interfaces are collected.
  
+ It is possible to use regular expressions to match interface names, if the
+ name is surrounded by I</.../> and collectd was compiled with support for
+ regexps. This is useful if there's a need to collect (or ignore) data
+ for a group of interfaces that are similarly named, without the need to
+ explicitly list all of them (especially useful if the list is dynamic).
+ Example:
+ 
+  Interface "lo"
+  Interface "/^veth/"
+  Interface "/^tun[0-9]+/"
+  IgnoreSelected "true"
+ 
+ This will ignore the loopback interface, all interfaces with names starting
+ with I<veth> and all interfaces with names starting with I<tun> followed by
+ at least one digit.
+ 
+ 
 +=item B<UniqueName> I<true>|I<false>
 +
 +Interface name is not unique on Solaris (KSTAT), interface name is unique 
 +only within a module/instance. Following tuple is considered unique: 
 +   (ks_module, ks_instance, ks_name)
 +If this option is set to true, interface name contains above three fields
 +separated by an underscore. For more info on KSTAT, visit
 +L<http://docs.oracle.com/cd/E23824_01/html/821-1468/kstat-3kstat.html#REFMAN3Ekstat-3kstat>
 +
 +This option is only available on Solaris.
 +
  =back
  
  =head2 Plugin C<ipmi>

diff --cc src/virt.c
Simple merge