Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Feb 2011 01:32:13 +0000 (17:32 -0800)
commit78998ca9cf65cc65579c8b756d35a2db9d3c8ef7
treed897294f854a85c547b4630fcc3d2bab96285a88
parent2098fd549f4c8a00246324a35de6af8144f5b628
parent5708ce5e83340d735ca9b87f028caf0bf5709b6e
Merge from mainline.