Merge branch 'master' into ff/dns
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:10:09 +0000 (13:10 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:10:09 +0000 (13:10 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge