Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:55:58 +0000 (15:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 22:55:58 +0000 (15:55 -0700)
commit271e61eb60721546bf373531852a88f14b840d12
tree617ada4d9e26a7d255d8c792165b40214c65ddb3
parentc6046b94e58b33ddcfca8f6361ddaf780ba5cb18
parent05920a43fc18e696b464387e781e7cfdcea5b5af
Merge from trunk.
src/ChangeLog
src/Makefile.in