From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 24 Nov 2012 12:48:55 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~77
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc9ce0d9c9e5c49737685523c2ac172f90c9e5f7;p=emacs.git

Merge from trunk.
---

bc9ce0d9c9e5c49737685523c2ac172f90c9e5f7