Merge branch '0.4.17'
authorDavid Schleef <ds@schleef.org>
Sun, 10 Mar 2013 19:16:49 +0000 (12:16 -0700)
committerDavid Schleef <ds@schleef.org>
Sun, 10 Mar 2013 19:16:49 +0000 (12:16 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge