Merge branch 'rj/libvirtstats'

Conflicts:

	AUTHORS

diff --cc AUTHORS
index d821df7a1c5b482c848e07d2ff78b8b6c33f45a9,cd0ba6fede6eaf989d75611d8c9df56b29d600d1..6c2b33ffa34defa0eaefaaa5976d629d4585fb85
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -60,10 -60,9 +60,13 @@@ Much time and effort to find a nasty bu
  contributed by:
    Luboš Staněk <lubek at users.sourceforge.net>
  
 +uuid module by:
 +  Dan Berrange <berrange@redhat.com>
 +  Richard W.M. Jones <rjones@redhat.com>
 +
+ Libvirt integration by:
+   Richard Jones <rjones@redhat.com>
+ 
  collectd is available at:
    <http://collectd.org/>
  

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

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