Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Jun 2011 03:54:09 +0000 (20:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Jun 2011 03:54:09 +0000 (20:54 -0700)
commit2d3c217e8ccd3ddfdd57ee9f46a2f2599d6d67c6
tree36cb5ed5a8252a12ecacad0f642f04e9c4ca9ca2
parent73dba34265faf12a46cef1edabe066af3159122a
parent1384b89ea7e51c190ab1df16e38cbef1d02400b4
Merge from trunk.
src/ChangeLog