Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 15:27:16 +0000 (08:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 15:27:16 +0000 (08:27 -0700)
commitb2db44d9c6b6895222e9de5ab58b3897fdb3c889
tree1e6f3d8392799f70c979c094e8c678d5bf860da9
parent1dc4aa6d975c9f92cd5c0d0baf5eae89e013fd67
parentd809b8eb5eb739839063fb9af1dc3ac593a0a560
Merge from trunk.
src/ChangeLog