Merge branch 'master' into ff/processes
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge