Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 23 Apr 2013 17:01:56 +0000 (20:01 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 23 Apr 2013 17:01:56 +0000 (20:01 +0300)
1  2  3 
src/Makefile.in

diff --cc src/Makefile.in
Simple merge