Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 31 Jan 2012 21:32:31 +0000 (16:32 -0500)
committerSam Hartman <hartmans@debian.org>
Tue, 31 Jan 2012 21:32:31 +0000 (16:32 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge