Merge from trunk.
commitaa1a7eb834c4671e3c49a97d72ca7e03f2a840a2
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:24:53 +0000 (30 22:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:24:53 +0000 (30 22:24 -0700)
tree895009402041b60dcc2f4896067f34cd0e4d6826
parent333d54dade1e7005d5a97612907158fe5ec3d310
parent738db17859465a4adaaf1d43bbb1d1eed307e712
Merge from trunk.
src/ChangeLog