Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 21:34:22 +0000 (14:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 21:34:22 +0000 (14:34 -0700)
commit6d69f077f1c4fac9c4562df816d7b711334d14c2
treef1978dae5aa81e26e0ea6daad08a85dc047ff361
parent316f8af0092ff66f564fd3052d2e35baa9a5817f
parent04d51ad41a26fe75b239d29fc71965fe39799954
Merge from trunk.
ChangeLog