Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (22:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (22:35 -0700)

Trivial merge