Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:47:05 +0000 (22:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:47:05 +0000 (22:47 -0700)
commit78cf1fe8a256ffc91533b43eb851bf4519e9fbcc
tree84b4d0a579e858040d49e6561be096132860446b
parentfc83f7d3d422039f041bbcc4f0cb75a1699421ad
parentb50691aaafa255709b1117000ce6fb98d9772695
Merge from trunk.
src/ChangeLog