From: Xue Fuqiao <xfq.free@gmail.com>
Date: Wed, 25 Dec 2013 22:27:00 +0000 (+0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~186^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77bbf3713d459c45492e6daed68437edcf863a0c;p=emacs.git

Merge from mainline.
---

77bbf3713d459c45492e6daed68437edcf863a0c