Merge branch 'ss/graphite'

diff --cc src/collectd.conf.in
index 9ae18cd,21badd4..0c21ee2
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -144,9 -144,10 +144,10 @@@
  #@BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem
  #@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
  #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
+ #@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@LoadPlugin write_graphite
  #@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http
  #@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 -#@BUILD_PLUGIN_WRITE_MONGO_TRUE@LoadPlugin write_mongo
 +#@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb
  #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
  #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc