Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:09:42 +0000 (16:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Feb 2011 00:09:42 +0000 (16:09 -0800)

Trivial merge