From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 07:12:15 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2726
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40d74a503910168002cb1e170494d2f6d1adfeba;p=emacs.git

merge from trunk
---

40d74a503910168002cb1e170494d2f6d1adfeba