Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 09:38:32 +0000 (02:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 09:38:32 +0000 (02:38 -0700)
commit1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615
tree16046f0d8917f94dec1d0a4dc8316e657a00ae1f
parent8a6ebd580bafa45ca1d8cc6294ea91facacfdbe0
parenta63e0781250f31d99360209d9053d380d6fe0815
Merge from trunk.
ChangeLog
src/ChangeLog