Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 01:12:12 +0000 (18:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 01:12:12 +0000 (18:12 -0700)
commit90856fe0b82ba19d1c3d73a4ba48007380201e66
tree1b41ea9c212d3e7c1da29d03acc155a177db6c7c
parent55d4c1b248e84d347ae73278faff623741f52691
parentca3cf0a561302e2a94eb0ab24063e29580a97fe1
Merge from trunk.
ChangeLog
src/ChangeLog
src/coding.c
src/image.c