Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
commit8d576a545d08182fae5c7d705a53da2a84e0d85a
tree4a63ae460c346b0a58d09b8f903ed442a1abb2d2
parentb1f367f797aa19047904e73a67e52f391c720e0d
parentc2216f8e3a2a17ba5b843f0329ce52c920a336b2
Merge from trunk.
src/ChangeLog