Merge changes from emacs-23 branch.
commit324ec9b4c3a6b2807a250011ed88dd662fbf39c2
authorChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:40:56 +0000 (6 12:40 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:40:56 +0000 (6 12:40 -0400)
tree713e79f9c8248861592d1d5440228f349a6f538c
parentce03d91cc641f8a9a14b4b73995d9d4c6646ba55
parentbaad6a73d4e2cb1a4249d4bf475a2982bcc198f4
Merge changes from emacs-23 branch.