Merge branch 'master' into ad/memcached

Conflicts:

	src/types.db

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/types.db
index bcfbeaf,fbce116..865335f
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -48,11 -48,8 +48,13 @@@ mysql_octets                rx:COUNTER:0:4294967295, 
  mysql_qcache          hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
  mysql_threads         running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
  nfs_procedure         value:COUNTER:0:4294967295
 +memcached_command     value:COUNTER:0:U
 +memcached_connections value:GAUGE:0:U
 +memcached_items               value:GAUGE:0:U
 +memcached_octets      rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 +memcached_ops         value:COUNTER:0:134217728
+ nginx_connections     value:GAUGE:0:U
+ nginx_requests                value:COUNTER:0:134217728
  percent                       percent:GAUGE:0:100.1
  ping                  ping:GAUGE:0:65535
  power                 value:GAUGE:0:U