Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Thu, 15 Jun 2006 10:45:39 +0000 (12:45 +0200)
committermaan <maan@Gumbo.local>
Thu, 15 Jun 2006 10:45:39 +0000 (12:45 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge