From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 10 Jul 2010 19:01:01 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~78^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0;p=emacs.git

Merge changes from emacs-23 branch.
---

7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0