fix conflict
authorAndre Noll <maan@congo.fml.local>
Fri, 11 Aug 2006 15:01:29 +0000 (17:01 +0200)
committerAndre Noll <maan@congo.fml.local>
Fri, 11 Aug 2006 15:01:29 +0000 (17:01 +0200)
commitb8741e4cfa64333e719f7b3abe38b94ef961b39d
treea5f982b8baab3257d540a2b890e818ed4f892009
parentc715d5c6ec226fe172ef3b8a52ccf769b745594b
fix conflict
configure.ac