Merge branch 'master' into 3.4-working release-3.4.3
authorDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 15:17:59 +0000 (11:17 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 15:17:59 +0000 (11:17 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge