Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 19 Apr 2013 08:39:24 +0000 (11:39 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 19 Apr 2013 08:39:24 +0000 (11:39 +0300)
1  2 
configure.ac

diff --cc configure.ac
Simple merge