Merge from trunk.
commit948b98fd3c17e56b5fa606eedbe6487091f2b66d
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 18:31:36 +0000 (25 11:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 18:31:36 +0000 (25 11:31 -0700)
tree470d98f5aa36d512902da3db4d9f35b3c0fe6f07
parent7a7ef429182915745380c3074771d9f747dab964
parent11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20
Merge from trunk.
src/ChangeLog