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

merge from trunk
---

339d3a117c08bdb7399ceb856ad6c793e9f01b53