Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Feb 2011 07:44:39 +0000 (23:44 -0800)
commit37b3d30244ad822e049b6b20c2eadf5946cb02cc
tree49bfe5e475aee761975f2618be4ee1b7c8371a72
parent0ca2f89e09202a02f392c1defba2105b69c01419
parent7d315eb67800796d7d7f39030eb7682340d985e5
Merge from mainline.
ChangeLog
src/ChangeLog