Merge from mainline.
commit997bfc65800964e26fb281c8d7490b060f4a1d87
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (19 23:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (19 23:27 -0700)
treee9704154fa5f96b05308fae4755aa526c2ce1327
parentb8e30af5f6f8f669a14318aa818a10e70553c821
parentfe0e7ad71862047ff05d6822d683c3efa7f64d0e
Merge from mainline.