Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:46:45 +0000 (14:46 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:46:45 +0000 (14:46 -0400)
commitb6bd159922608fa474026837771d63bf7eadcf97
treec8049a810e9e1f511ff9e79b87ba1d27803fd980
parent04c52e2f5bffa157bcec3a9b1d0a57c4df36bfea
parentfa2ec41ffd2cace14f37f5d18d986b410cb038a1
Merge changes from emacs-23
src/ChangeLog
src/keymap.c