Merge from trunk
commit2e6c483eb92fef6a527506bb1cb1ce6453789514
authorMartin Rudalics <rudalics@gmx.at>
Wed, 27 Oct 2010 06:17:08 +0000 (27 08:17 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Wed, 27 Oct 2010 06:17:08 +0000 (27 08:17 +0200)
treeaa3704f47019bec64620ecab563bbb96f7a4c568
parent31fd7e7a4232a9b558236e03e8eb1e539e830d7e
parent3444dc6164e49874d253fb921df31f45f4554090
Merge from trunk
lisp/ChangeLog
lisp/loadup.el
src/ChangeLog