Merge from trunk
commit820e18f38d9ff35a3ecff82d83fb15d13661cf2c
authorMartin Rudalics <rudalics@gmx.at>
Fri, 5 Nov 2010 07:23:30 +0000 (5 08:23 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 5 Nov 2010 07:23:30 +0000 (5 08:23 +0100)
treeb6008244637b5c5c5837e5fabe719a7d3ab77c90
parent1579f37824b59246609a5d8276ffc640a40b71dc
parent0c3a9a9fb4c3bf52e3de586dc92f60090ac6bcd9
Merge from trunk
lisp/ChangeLog
lisp/vc/ediff-util.el
src/ChangeLog