Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 27 Sep 2011 01:13:58 +0000 (18:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 27 Sep 2011 01:13:58 +0000 (18:13 -0700)

Trivial merge