Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 18 Aug 2011 17:01:52 +0000 (10:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 18 Aug 2011 17:01:52 +0000 (10:01 -0700)
commit76667214e7bdc7f6196de2bb6d7e14ef879a2694
tree58ca2d3448d502ff4ac2e46aefc8b90582c4d1ab
parent2fab8395070ff77b836cb8ca9b84c261c4387a9a
parent92b714445aac9be4227684f9c90cd61c3a0f02d5
Merge from trunk.
src/ChangeLog
src/dispextern.h
src/process.c