Merge remote branch 'nobled/for-krh'
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 28 Jan 2011 16:21:42 +0000 (11:21 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 28 Jan 2011 16:21:42 +0000 (11:21 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge