Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:56:58 +0000 (12:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:56:58 +0000 (12:56 -0700)
commitbe7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023
treefc51501aa66ecdffb95b8a71edf204bdf6515b03
parent9d34ec3e75704342c2875907d6676e1c5e5b5389
parent18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959
Merge from trunk.
src/ChangeLog