Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 31 Aug 2011 20:02:51 +0000 (13:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 31 Aug 2011 20:02:51 +0000 (13:02 -0700)
commite91caa6011949f45790cd131883b2b3b26d6a0a2
tree2a45db55036fca909bb43d0a5bfdbfe777f8e9e8
parent61bfeeb79dee6b321cb9f2257aeec9d0c1fa5a2f
parent9b6e5515b40f5863df5533fd90428799b62eac43
Merge from trunk.
src/ChangeLog