Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Jun 2011 18:07:38 +0000 (11:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Jun 2011 18:07:38 +0000 (11:07 -0700)
commitff672d2c8785de6faba84a400fb8153e9fa07cd2
tree4c5dc68b7a92e54c86e47f3bd9a804c14be57091
parente69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e
parentb96e6cde3e311cd79f8ad134291d41c8c64cc6ad
Merge from trunk.
src/ChangeLog
src/xfns.c