Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 13 Mar 2010 09:02:01 +0000 (04:02 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 13 Mar 2010 09:02:01 +0000 (04:02 -0500)
1  2 
src/term.c

diff --cc src/term.c
Simple merge