Merge branch 'master' of git://github.com/octo/collectd
authorGarret Heaton <powdahound@gmail.com>
Mon, 9 Nov 2009 16:53:51 +0000 (08:53 -0800)
committerGarret Heaton <powdahound@gmail.com>
Mon, 9 Nov 2009 16:53:51 +0000 (08:53 -0800)

Trivial merge