Code

Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 May 2007 10:36:12 +0000 (12:36 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge