Merge from trunk.
commit1a091fbc08faa3bab85e74f7fac72a955600a8f6
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:06:52 +0000 (29 13:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 20:06:52 +0000 (29 13:06 -0700)
treee3f3a5700086aef93d027590c497ccac14b0e696
parentc43c8a6af9f6877b97c1f9a88e361456775cb88b
parentb31b81a53a0908e16360003c0218dadba897f449
Merge from trunk.
src/ChangeLog
src/term.c