Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 12 Jan 2011 05:57:19 +0000 (21:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 12 Jan 2011 05:57:19 +0000 (21:57 -0800)
commit7ea547574105f338c900d0c59390287c750a18c0
treeebe2282d83447c9ecf34177320a2915e2201271d
parente8c53d3abf2f23dc40ed2bc748678025d5b5a5bc
parent529ee9edf2fd51f3e53f1fc4f7a9ba1859b0af99
Merge from mainline.
src/ChangeLog
src/fns.c
src/image.c