Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 6 May 2011 06:30:56 +0000 (23:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 6 May 2011 06:30:56 +0000 (23:30 -0700)
commit8ff0ac3c78498c905a22786aa124f59d213b99a0
treea0448dee34e826197c000ec615dd172cfb59bcc1
parent9991d78e8cd74e986a9b7625c12a43fbf7a283b3
parent548d0a63d6212c0baef9a3d2bf0093cceb4e1136
Merge from mainline.
Makefile.in
src/ChangeLog
src/image.c
src/lread.c