Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)

Trivial merge