Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 18:58:22 +0000 (11:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 18:58:22 +0000 (11:58 -0700)

Trivial merge