Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (14:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (14:32 -0700)

Trivial merge