Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 3 Apr 2007 07:04:17 +0000 (09:04 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 3 Apr 2007 07:04:17 +0000 (09:04 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge