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)
commit6570e0e4433a5e5d7987697716a1f993c96eb1bb
treea446317284abd894412fe64f98db13a016fd4ef0
parent27638103f249ffbe9768603b9baff199950fd9f6
parent786010c598f79d20280e6ea9ea458cad4a7e9af7
Merge branch 'master' into my-osx
configure.ac