Merge from mainline.
commit4ab1a043741c58d3b964c31a70d778c266ffc8bf
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 07:28:39 +0000 (26 23:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Jan 2011 07:28:39 +0000 (26 23:28 -0800)
treef41dd08125c3db9850f0039f3d0d590bf111e9a4
parenta8165a388c106988c67f72af6dd4e845db847888
parentb668667295a973828475ba422064098cd044a1fc
Merge from mainline.