Merge branch 'collectd-4.1'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 18:11:05 +0000 (20:11 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 18:11:05 +0000 (20:11 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge