Merge remote branch 'origin/ff/modbus'

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

diff --cc src/modbus.c
index cad4b2c,a14cced..19848b0
--- 1/src/modbus.c
--- 2/src/modbus.c
+++ b/src/modbus.c
@@@ -1,11 -1,10 +1,11 @@@
  /**
   * collectd - src/modbus.c
-  * Copyright (C) 2010  noris network AG
+  * Copyright (C) 2010,2011  noris network AG
   *
   * This program is free software; you can redistribute it and/or modify it
 - * under the terms of the GNU General Public License as published by the
 - * Free Software Foundation; only version 2 of the License is applicable.
 + * under the terms of the GNU Lesser General Public License as published by
 + * the Free Software Foundation; only version 2.1 of the License is
 + * applicable.
   *
   * This program is distributed in the hope that it will be useful, but
   * WITHOUT ANY WARRANTY; without even the implied warranty of