Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)

Trivial merge