Merge branch 'master' into ff/dns
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Oct 2006 08:16:44 +0000 (10:16 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Oct 2006 08:16:44 +0000 (10:16 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge