Merge branch 'master' into connectivity

diff --cc AUTHORS
index 9fcb386,409655a..bf785f6
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -62,9 -59,9 +62,12 @@@ Andrew Bays <abays at redhat.com
  Andy Parkins <andyp at fussylogic.co.uk>
   - battery plugin: sysfs code.
  
 +Aneesh Puttur <aputtur at redhat.com>
 + - connectivity plugin.
 +
+ Andy Smith <ansmith at redhat.com>
+  - AMQP 1.0 plugin.
+ 
  Anthony Dewhurst <dewhurst at gmail.com>
   - zfs_arc plugin.
  

diff --cc Makefile.am
Simple merge

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
Simple merge

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

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

diff --cc src/types.db
index 01bb353,f4933ee..3f8b581
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -31,8 -31,8 +31,9 @@@ clock_state             value:GAUGE:0:
  clock_stratum           value:GAUGE:0:U
  compression             uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
  compression_ratio       value:GAUGE:0:2
+ commands                value:DERIVE:0:U
  connections             value:DERIVE:0:U
 +connectivity            value:GAUGE:0:2
  conntrack               value:GAUGE:0:4294967295
  contextswitch           value:DERIVE:0:U
  cookies                 value:DERIVE:0:U