Merge Trond
authorBrian Aker <brian@gaz>
Mon, 2 Aug 2010 18:33:16 +0000 (11:33 -0700)
committerBrian Aker <brian@gaz>
Mon, 2 Aug 2010 18:33:16 +0000 (11:33 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge