Merge from mainline.
commit2c520ab5fb6054f0f54804301e36d519387ccbab
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2011 00:24:09 +0000 (22 17:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 23 Mar 2011 00:24:09 +0000 (22 17:24 -0700)
tree0ec880a6bd0d3b82ea93caa1802601f31f2f7e67
parent8af8e70ee535bd2d657a034e1452f78925c9ca38
parent9d0da923ebd2b78abb6e02f0b90cfe9d818eb301
Merge from mainline.
src/ChangeLog