Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (15:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (15:58 -0800)

Trivial merge