Merged from me.
authorMonty Taylor <mordred@inaugust.com>
Wed, 17 Jun 2009 16:55:52 +0000 (09:55 -0700)
committerMonty Taylor <mordred@inaugust.com>
Wed, 17 Jun 2009 16:55:52 +0000 (09:55 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge