Merge branch 'sp/amqp'

diff --cc README
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
index 12cec75,31a113a..42addd2
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -150,13 -149,25 +151,27 @@@
  # ription of those options is available in the collectd.conf(5) manual page. #
  ##############################################################################
  
+ #<Plugin "amqp">
+ #  <Publish "name">
+ #    Host "localhost"
+ #    Port "5672"
+ #    VHost "/"
+ #    User "guest"
+ #    Password "guest"
+ #    Exchange "amq.fanout"
+ #    RoutingKey "collectd"
+ #    Persistent false
+ #    StoreRates false
+ #  </Publish>
+ #</Plugin>
+ 
  #<Plugin apache>
 -#     URL "http://localhost/status?auto"
 -#     User "www-user"
 -#     Password "secret"
 -#     CACert "/etc/ssl/ca.crt"
 +#  <Instance "local">
 +#    URL "http://localhost/status?auto"
 +#    User "www-user"
 +#    Password "secret"
 +#    CACert "/etc/ssl/ca.crt"
 +#  </Instance>
  #</Plugin>
  
  #<Plugin apcups>

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