Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 6 Mar 2010 10:16:27 +0000 (05:16 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 6 Mar 2010 10:16:27 +0000 (05:16 -0500)
1  2 
src/buffer.c

diff --cc src/buffer.c
Simple merge