Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 20:43:14 +0000 (13:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 20:43:14 +0000 (13:43 -0700)

Trivial merge