Merge from trunk.
commit510005210ac9f4d813c4a2cc99b2c3c11e57c055
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:01:00 +0000 (22 09:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:01:00 +0000 (22 09:01 -0700)
tree85b8b7bd35e451c71f9f58f2de3ae3ae16c0b25f
parentb79e8648b908c6600b99c20d4782e6413d6907ef
parentddb7ffeeb8ace6501eb453f50f0f9f6852eda21f
Merge from trunk.
src/ChangeLog
src/composite.c
src/fns.c
src/image.c