Merge commit 'remotes/octo/st/netapp' into st/netapp
authorSven Trenkel <collectd@semidefinite.de>
Wed, 30 Sep 2009 10:17:55 +0000 (12:17 +0200)
committerSven Trenkel <collectd@semidefinite.de>
Wed, 30 Sep 2009 10:17:55 +0000 (12:17 +0200)

Trivial merge