From: Joakim Verona <joakim@verona.se>
Date: Mon, 16 Sep 2013 16:10:39 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2641
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1c9aa247cab9148916b367e719219ea0f055adb;p=emacs.git

merge from trunk
---

c1c9aa247cab9148916b367e719219ea0f055adb