Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 09:00:26 +0000 (11:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 1 May 2010 09:00:26 +0000 (11:00 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge