Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)

Trivial merge