Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 01:22:25 +0000 (18:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 01:22:25 +0000 (18:22 -0700)
commitfda8c8fa718a63e4f8106ed628978fed72837c13
treef88abb476d8e9b7342833b0170ae9399c7cf4c76
parentf7752e67381d84cf8c76227b4112d72122b86d98
parent3539f31f03b40bafa0875de88e3a5d55558ba32c
Merge from trunk.
src/ChangeLog